diff --git a/gulpfile.js b/gulpfile.js
index 25821349..13a3ddac 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -5,7 +5,6 @@
 const browserify = require('browserify');
 const buffer = require('vinyl-buffer');
 const coveralls = require('gulp-coveralls');
-const concat = require('gulp-concat');
 const fs = require('fs-extra');
 const gulp = require('gulp');
 const path = require('path');
@@ -118,16 +117,6 @@ gulp.task('browserify-addons', ['tsc'], function() {
         .pipe(sourcemaps.write('./'))
         .pipe(gulp.dest(buildDir));
 
-  let zmodemBundle = gulp.src([
-        './node_modules/zmodem.js/dist/zmodem.js',
-        './src/addons/zmodem/zmodem.js',
-  ]).pipe( concat('zmodem.js') ).pipe( gulp.dest( `${buildDir}/addons/zmodem` ) );
-
-  let zmodemDemoBundle = gulp.src([
-    // Copy JS addons
-    `${outDir}/addons/zmodem/demo/**`,
-  ]).pipe(gulp.dest(`${buildDir}/addons/zmodem/demo`));
-
   let winptyCompatOptions = {
     basedir: `${buildDir}/addons/winptyCompat`,
     debug: true,
@@ -151,10 +140,9 @@ gulp.task('browserify-addons', ['tsc'], function() {
     // Exclude TS addons from copy as they are being built via browserify
     `!${outDir}/addons/search`,
     `!${outDir}/addons/search/**`,
-    `!${outDir}/addons/zmodem/**`,
   ]).pipe(gulp.dest(`${buildDir}/addons`));
 
-  return merge(searchBundle, zmodemBundle, zmodemDemoBundle, winptyCompatBundle, copyAddons);
+  return merge(searchBundle, winptyCompatBundle, copyAddons);
 });
 
 gulp.task('instrument-test', function () {
diff --git a/src/addons/zmodem/demo/app.js b/src/addons/zmodem/demo/app.js
index a9d0bbd0..31ecd7d2 100644
--- a/src/addons/zmodem/demo/app.js
+++ b/src/addons/zmodem/demo/app.js
@@ -8,6 +8,8 @@ var terminals = {},
     logs = {};
 
 app.use('/build', express.static(__dirname + '/../../../../build'));
+app.use('/demo', express.static(__dirname + '/../../../../demo'));
+app.use('/zmodemjs', express.static(__dirname + '/../../../../node_modules/zmodem.js/dist'));
 
 app.get('/', function(req, res){
   res.sendFile(__dirname + '/index.html');
diff --git a/src/addons/zmodem/demo/index.html b/src/addons/zmodem/demo/index.html
index c6750618..aee7742a 100644
--- a/src/addons/zmodem/demo/index.html
+++ b/src/addons/zmodem/demo/index.html
@@ -4,12 +4,13 @@
         <title>xterm.js demo</title>
         <link rel="stylesheet" href="/build/xterm.css" />
         <link rel="stylesheet" href="/build/addons/fullscreen/fullscreen.css" />
-        <link rel="stylesheet" href="style.css" />
+        <link rel="stylesheet" href="/demo/style.css" />
       	<script src="https://cdnjs.cloudflare.com/ajax/libs/es6-promise/4.1.1/es6-promise.auto.min.js"></script>
       	<script src="https://cdnjs.cloudflare.com/ajax/libs/fetch/1.0.0/fetch.min.js"></script>
         <script src="/build/xterm.js" ></script>
 
         <script src="/build/addons/attach/attach.js" ></script>
+        <script src="/zmodemjs/zmodem.js"></script>
         <script src="/build/addons/zmodem/zmodem.js" ></script>
 
         <script src="/build/addons/fit/fit.js" ></script>
diff --git a/src/addons/zmodem/demo/style.css b/src/addons/zmodem/demo/style.css
deleted file mode 120000
index 8d425da2..00000000
--- a/src/addons/zmodem/demo/style.css
+++ /dev/null
@@ -1 +0,0 @@
-../../../../demo/style.css
\ No newline at end of file