diff --git a/core/core.gradle b/core/core.gradle
index 0023ecc1dc..826a81f0eb 100644
--- a/core/core.gradle
+++ b/core/core.gradle
@@ -1,9 +1,5 @@
 // Core build file
 
-// We don't define a module dependency on crypto to avoid creating a transitive dependency
-def cryptoProject = project(':spring-security-crypto')
-def cryptoClasses = cryptoProject.sourceSets.main.classes
-
 dependencies {
     compile 'aopalliance:aopalliance:1.0',
             "net.sf.ehcache:ehcache:$ehcacheVersion",
@@ -24,17 +20,13 @@ dependencies {
     testRuntime "hsqldb:hsqldb:$hsqlVersion"
 }
 
-compileJava.dependsOn cryptoProject.compileJava
-classes.dependsOn cryptoProject.classes
+// jdkVersion = System.properties['java.version']
+// isJdk6 = jdkVersion >= '1.6'
+int maxAESKeySize = javax.crypto.Cipher.getMaxAllowedKeyLength('AES')
 
-classes.doLast {
-    copy {
-        from cryptoClasses
-        into sourceSets.main.classesDir
+test {
+    if (maxAESKeySize < 256) {
+        logger.warn("AES keysize limited to $maxAESKeySize, skipping EncryptorsTests")
+        exclude '**/EncryptorsTests.class'
     }
 }
-
-sourceSets.main.compileClasspath += cryptoClasses
-sourceSets.test.compileClasspath += cryptoClasses
-
-sourceJar.from cryptoProject.sourceSets.main.java
diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/AesBytesEncryptor.java b/core/src/main/java/org/springframework/security/crypto/encrypt/AesBytesEncryptor.java
similarity index 100%
rename from crypto/src/main/java/org/springframework/security/crypto/encrypt/AesBytesEncryptor.java
rename to core/src/main/java/org/springframework/security/crypto/encrypt/AesBytesEncryptor.java
diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/BytesEncryptor.java b/core/src/main/java/org/springframework/security/crypto/encrypt/BytesEncryptor.java
similarity index 100%
rename from crypto/src/main/java/org/springframework/security/crypto/encrypt/BytesEncryptor.java
rename to core/src/main/java/org/springframework/security/crypto/encrypt/BytesEncryptor.java
diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/Encryptors.java b/core/src/main/java/org/springframework/security/crypto/encrypt/Encryptors.java
similarity index 100%
rename from crypto/src/main/java/org/springframework/security/crypto/encrypt/Encryptors.java
rename to core/src/main/java/org/springframework/security/crypto/encrypt/Encryptors.java
diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/HexEncodingTextEncryptor.java b/core/src/main/java/org/springframework/security/crypto/encrypt/HexEncodingTextEncryptor.java
similarity index 100%
rename from crypto/src/main/java/org/springframework/security/crypto/encrypt/HexEncodingTextEncryptor.java
rename to core/src/main/java/org/springframework/security/crypto/encrypt/HexEncodingTextEncryptor.java
diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/TextEncryptor.java b/core/src/main/java/org/springframework/security/crypto/encrypt/TextEncryptor.java
similarity index 100%
rename from crypto/src/main/java/org/springframework/security/crypto/encrypt/TextEncryptor.java
rename to core/src/main/java/org/springframework/security/crypto/encrypt/TextEncryptor.java
diff --git a/crypto/src/main/java/org/springframework/security/crypto/keygen/BytesKeyGenerator.java b/core/src/main/java/org/springframework/security/crypto/keygen/BytesKeyGenerator.java
similarity index 100%
rename from crypto/src/main/java/org/springframework/security/crypto/keygen/BytesKeyGenerator.java
rename to core/src/main/java/org/springframework/security/crypto/keygen/BytesKeyGenerator.java
diff --git a/crypto/src/main/java/org/springframework/security/crypto/keygen/HexEncodingStringKeyGenerator.java b/core/src/main/java/org/springframework/security/crypto/keygen/HexEncodingStringKeyGenerator.java
similarity index 100%
rename from crypto/src/main/java/org/springframework/security/crypto/keygen/HexEncodingStringKeyGenerator.java
rename to core/src/main/java/org/springframework/security/crypto/keygen/HexEncodingStringKeyGenerator.java
diff --git a/crypto/src/main/java/org/springframework/security/crypto/keygen/KeyGenerators.java b/core/src/main/java/org/springframework/security/crypto/keygen/KeyGenerators.java
similarity index 100%
rename from crypto/src/main/java/org/springframework/security/crypto/keygen/KeyGenerators.java
rename to core/src/main/java/org/springframework/security/crypto/keygen/KeyGenerators.java
diff --git a/crypto/src/main/java/org/springframework/security/crypto/keygen/SecureRandomBytesKeyGenerator.java b/core/src/main/java/org/springframework/security/crypto/keygen/SecureRandomBytesKeyGenerator.java
similarity index 100%
rename from crypto/src/main/java/org/springframework/security/crypto/keygen/SecureRandomBytesKeyGenerator.java
rename to core/src/main/java/org/springframework/security/crypto/keygen/SecureRandomBytesKeyGenerator.java
diff --git a/crypto/src/main/java/org/springframework/security/crypto/keygen/SharedKeyGenerator.java b/core/src/main/java/org/springframework/security/crypto/keygen/SharedKeyGenerator.java
similarity index 100%
rename from crypto/src/main/java/org/springframework/security/crypto/keygen/SharedKeyGenerator.java
rename to core/src/main/java/org/springframework/security/crypto/keygen/SharedKeyGenerator.java
diff --git a/crypto/src/main/java/org/springframework/security/crypto/keygen/StringKeyGenerator.java b/core/src/main/java/org/springframework/security/crypto/keygen/StringKeyGenerator.java
similarity index 100%
rename from crypto/src/main/java/org/springframework/security/crypto/keygen/StringKeyGenerator.java
rename to core/src/main/java/org/springframework/security/crypto/keygen/StringKeyGenerator.java
diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/NoOpPasswordEncoder.java b/core/src/main/java/org/springframework/security/crypto/password/NoOpPasswordEncoder.java
similarity index 100%
rename from crypto/src/main/java/org/springframework/security/crypto/password/NoOpPasswordEncoder.java
rename to core/src/main/java/org/springframework/security/crypto/password/NoOpPasswordEncoder.java
diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/PasswordEncoder.java b/core/src/main/java/org/springframework/security/crypto/password/PasswordEncoder.java
similarity index 100%
rename from crypto/src/main/java/org/springframework/security/crypto/password/PasswordEncoder.java
rename to core/src/main/java/org/springframework/security/crypto/password/PasswordEncoder.java
diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/StandardPasswordEncoder.java b/core/src/main/java/org/springframework/security/crypto/password/StandardPasswordEncoder.java
similarity index 100%
rename from crypto/src/main/java/org/springframework/security/crypto/password/StandardPasswordEncoder.java
rename to core/src/main/java/org/springframework/security/crypto/password/StandardPasswordEncoder.java
diff --git a/crypto/src/main/java/org/springframework/security/crypto/util/CipherUtils.java b/core/src/main/java/org/springframework/security/crypto/util/CipherUtils.java
similarity index 100%
rename from crypto/src/main/java/org/springframework/security/crypto/util/CipherUtils.java
rename to core/src/main/java/org/springframework/security/crypto/util/CipherUtils.java
diff --git a/crypto/src/main/java/org/springframework/security/crypto/util/Digester.java b/core/src/main/java/org/springframework/security/crypto/util/Digester.java
similarity index 100%
rename from crypto/src/main/java/org/springframework/security/crypto/util/Digester.java
rename to core/src/main/java/org/springframework/security/crypto/util/Digester.java
diff --git a/crypto/src/main/java/org/springframework/security/crypto/util/EncodingUtils.java b/core/src/main/java/org/springframework/security/crypto/util/EncodingUtils.java
similarity index 100%
rename from crypto/src/main/java/org/springframework/security/crypto/util/EncodingUtils.java
rename to core/src/main/java/org/springframework/security/crypto/util/EncodingUtils.java
diff --git a/crypto/src/test/java/org/springframework/security/crypto/encrypt/EncryptorsTests.java b/core/src/test/java/org/springframework/security/crypto/encrypt/EncryptorsTests.java
similarity index 100%
rename from crypto/src/test/java/org/springframework/security/crypto/encrypt/EncryptorsTests.java
rename to core/src/test/java/org/springframework/security/crypto/encrypt/EncryptorsTests.java
diff --git a/crypto/src/test/java/org/springframework/security/crypto/keygen/KeyGeneratorsTests.java b/core/src/test/java/org/springframework/security/crypto/keygen/KeyGeneratorsTests.java
similarity index 100%
rename from crypto/src/test/java/org/springframework/security/crypto/keygen/KeyGeneratorsTests.java
rename to core/src/test/java/org/springframework/security/crypto/keygen/KeyGeneratorsTests.java
diff --git a/crypto/src/test/java/org/springframework/security/crypto/password/StandardPasswordEncoderTests.java b/core/src/test/java/org/springframework/security/crypto/password/StandardPasswordEncoderTests.java
similarity index 100%
rename from crypto/src/test/java/org/springframework/security/crypto/password/StandardPasswordEncoderTests.java
rename to core/src/test/java/org/springframework/security/crypto/password/StandardPasswordEncoderTests.java
diff --git a/crypto/src/test/java/org/springframework/security/crypto/util/DigesterTests.java b/core/src/test/java/org/springframework/security/crypto/util/DigesterTests.java
similarity index 100%
rename from crypto/src/test/java/org/springframework/security/crypto/util/DigesterTests.java
rename to core/src/test/java/org/springframework/security/crypto/util/DigesterTests.java
diff --git a/crypto/src/test/java/org/springframework/security/crypto/util/EncodingUtilsTests.java b/core/src/test/java/org/springframework/security/crypto/util/EncodingUtilsTests.java
similarity index 100%
rename from crypto/src/test/java/org/springframework/security/crypto/util/EncodingUtilsTests.java
rename to core/src/test/java/org/springframework/security/crypto/util/EncodingUtilsTests.java
diff --git a/crypto/crypto.gradle b/crypto/crypto.gradle
deleted file mode 100644
index 6b096821a7..0000000000
--- a/crypto/crypto.gradle
+++ /dev/null
@@ -1,12 +0,0 @@
-// crypto module build file
-
-// jdkVersion = System.properties['java.version']
-// isJdk6 = jdkVersion >= '1.6'
-int maxAESKeySize = javax.crypto.Cipher.getMaxAllowedKeyLength('AES')
-
-test {
-    if (maxAESKeySize < 256) {
-        println "AES keysize limited to $maxAESKeySize, skipping EncryptorsTests"
-        exclude '**/EncryptorsTests.class'
-    }
-}
diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/package-info.java b/crypto/src/main/java/org/springframework/security/crypto/encrypt/package-info.java
deleted file mode 100644
index f1ed951c6b..0000000000
--- a/crypto/src/main/java/org/springframework/security/crypto/encrypt/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Symmetric-key data encryption.
- */
-package org.springframework.security.crypto.encrypt;
-
diff --git a/crypto/src/main/java/org/springframework/security/crypto/keygen/package-info.java b/crypto/src/main/java/org/springframework/security/crypto/keygen/package-info.java
deleted file mode 100644
index 7753ded001..0000000000
--- a/crypto/src/main/java/org/springframework/security/crypto/keygen/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Secure random key generators.
- */
-package org.springframework.security.crypto.keygen;
-
-
diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/package-info.java b/crypto/src/main/java/org/springframework/security/crypto/password/package-info.java
deleted file mode 100644
index b3ff0bc39e..0000000000
--- a/crypto/src/main/java/org/springframework/security/crypto/password/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Password encoders.
- */
-package org.springframework.security.crypto.password;
-
diff --git a/crypto/src/main/java/org/springframework/security/crypto/util/package-info.java b/crypto/src/main/java/org/springframework/security/crypto/util/package-info.java
deleted file mode 100644
index df123e1d9f..0000000000
--- a/crypto/src/main/java/org/springframework/security/crypto/util/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Shared crypto utilities for internal module use.
- * These are liable to change or be refactored and should not be used by external code.
- */
-package org.springframework.security.crypto.util;
diff --git a/crypto/template.mf b/crypto/template.mf
deleted file mode 100644
index cce442c914..0000000000
--- a/crypto/template.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-Implementation-Title: org.springframework.security.crypto
-Implementation-Version: ${version}
-Bundle-SymbolicName: org.springframework.security.crypto
-Bundle-Name: Spring Security Crypto
-Bundle-Vendor: SpringSource
-Bundle-Version: ${version}
-Bundle-ManifestVersion: 2
-Excluded-Imports:
- javax.crypto.*
-Ignored-Existing-Headers:
- Import-Package,
- Export-Package
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 4d77946e9b..774a0af408 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,8 +7,7 @@ def String[] modules = [
     'cas',
     'openid',
     'taglibs',
-    'aspects',
-    'crypto'
+    'aspects'
 ]
 
 def String[] samples = [