diff --git a/.gitmodules b/.gitmodules
index 69b7951..50821d2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,9 @@
 [submodule "ACardEmulator/app/src/main/external/IsoApplet"]
 	path = ACardEmulator/app/src/main/external/IsoApplet
 	url = https://github.com/philipWendland/IsoApplet.git
+[submodule "ACardEmulator/app/src/main/external/jcardsim"]
+	path = ACardEmulator/app/src/main/external/jcardsim
+	url = https://github.com/frankmorgner/jcardsim.git
 [submodule "ACardEmulator/app/src/main/external/MuscleApplet"]
 	path = ACardEmulator/app/src/main/external/MuscleApplet
 	url = https://github.com/martinpaljak/MuscleApplet.git
diff --git a/ACardEmulator/app/build.gradle b/ACardEmulator/app/build.gradle
index 25a668d..03b1dbd 100644
--- a/ACardEmulator/app/build.gradle
+++ b/ACardEmulator/app/build.gradle
@@ -17,6 +17,16 @@ android {
         }
     }
     sourceSets {
+        main.java.srcDirs += 'src/main/external/jcardsim/src/main/java'
+        main.java.exclude('**/APDUScriptTool.java')
+        main.java.exclude('**/JavaxSmartCardInterface.java')
+        main.java.exclude('**/CardTerminalSimulator.java')
+        main.java.exclude('**/JCSCard*.java')
+        main.java.exclude('**/JCSTerminal.java')
+        main.java.exclude('**/JCSFactory.java')
+        main.java.exclude('**/CardSimulator.java')
+        main.java.exclude('**/CAD.java')
+        main.java.exclude('**/CardTerminalSimulator.java')
         main.java.srcDirs += 'src/main/external/GidsApplet/src'
         main.java.exclude('**/gidsAppletTests/*.java')
         main.java.srcDirs += 'src/main/external/IsoApplet/src'
diff --git a/ACardEmulator/app/libs/jcardsim-3.0.4-SNAPSHOT-android.jar b/ACardEmulator/app/libs/jcardsim-3.0.4-SNAPSHOT-android.jar
deleted file mode 100644
index b1fef5b..0000000
Binary files a/ACardEmulator/app/libs/jcardsim-3.0.4-SNAPSHOT-android.jar and /dev/null differ
diff --git a/ACardEmulator/app/src/main/external/jcardsim b/ACardEmulator/app/src/main/external/jcardsim
new file mode 160000
index 0000000..73cc187
--- /dev/null
+++ b/ACardEmulator/app/src/main/external/jcardsim
@@ -0,0 +1 @@
+Subproject commit 73cc18710c79365fae8e12652ff174226a9dac1e