diff --git a/Gruntfile.js b/Gruntfile.js
index 835d5da..7df424d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -136,7 +136,10 @@ module.exports = function(grunt) {
                     'imap-client/node_modules/mimelib/node_modules/encoding/node_modules/mime/src/*.js',
                     'imap-client/node_modules/mailparser/src/*.js',
                     'imap-client/node_modules/mailparser/node_modules/mime/src/mime.js',
-                    'smtp-client/src-gen/*.js'
+                    'smtp-client/src/*.js',
+                    'smtp-client/node_modules/mailcomposer/src/*',
+                    'smtp-client/node_modules/nodemailer/src/*',
+                    'smtp-client/node_modules/nodemailer/node_modules/simplesmtp/src/*',
                 ],
                 dest: 'src/lib/'
             },
diff --git a/package.json b/package.json
index 562edf0..f9d9aa6 100644
--- a/package.json
+++ b/package.json
@@ -5,14 +5,14 @@
         "node": ">=0.8"
     },
     "scripts": {
-        "postinstall": "./res/copy-deps.sh && grunt dist-npm",
+        "postinstall": "grunt dist-npm",
         "test": "grunt test && grunt dist",
         "start": "grunt dist && grunt dev"
     },
     "dependencies": {
         "crypto-lib": "https://github.com/whiteout-io/crypto-lib/tarball/master",
         "imap-client": "git+ssh://git@github.com:whiteout-io/imap-client.git#master",
-        "smtp-client": "git+ssh://git@github.com:whiteout-io/smtp-client.git#master",
+        "smtp-client": "git+ssh://git@github.com:whiteout-io/smtp-client.git#amd",
         "requirejs": "2.1.8"
     },
     "devDependencies": {
diff --git a/res/copy-deps.sh b/res/copy-deps.sh
deleted file mode 100755
index 043ce60..0000000
--- a/res/copy-deps.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-echo "--> building dependencies to src\n"
-
-# go to root
-cd `dirname $0`
-cd ..
-
-# build imap/smtp modules and copy
-cd ./node_modules/smtp-client/
-node build.js
-cd ../../
-
-echo "\n--> finished building dependencies.\n"
diff --git a/src/require-config.js b/src/require-config.js
index 745f48b..693168e 100644
--- a/src/require-config.js
+++ b/src/require-config.js
@@ -9,7 +9,6 @@
 			'node-forge': 'forge',
 			cryptoLib: '../js/crypto',
 			'setimmediate': 'setImmediate',
-			'smtp-client': 'smtp-client-browserified',
 			underscore: 'underscore/underscore-min',
 			cordova: 'cordova/cordova-2.5.0',
 			lawnchair: 'lawnchair/lawnchair-git',