diff --git a/.gitmodules b/.gitmodules
index a18b9eb73f34f268fe4362ce650beb71beaeef47..b13eab1a8345024c5e059369ef45656b823ca2c8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "tinydtls"]
+[submodule "DTLSSocket/tinydtls"]
 	path = DTLSSocket/tinydtls
-	url = https://git.eclipse.org/r/tinydtls/org.eclipse.tinydtls
+	url = https://github.com/eclipse/tinydtls.git
diff --git a/DTLSSocket/tinydtls b/DTLSSocket/tinydtls
index 9a3496119688047b6d8b79826f13425397d92e10..1f1bc2ab571ad67df55f3723b8d4aac98710acb9 160000
--- a/DTLSSocket/tinydtls
+++ b/DTLSSocket/tinydtls
@@ -1 +1 @@
-Subproject commit 9a3496119688047b6d8b79826f13425397d92e10
+Subproject commit 1f1bc2ab571ad67df55f3723b8d4aac98710acb9
diff --git a/setup.py b/setup.py
index 5fef81af5910a7c3a1267f0e8bcbed493f89d0f1..5eb1ab2febe9b03ec4bd15eea080f12e90e9f5b4 100644
--- a/setup.py
+++ b/setup.py
@@ -17,8 +17,7 @@ class prepare_tinydtls(build_ext):
                 sys.exit(1)
 
         commands =  [
-                    ["sh", "-c", "autoconf"],
-                    ["sh", "-c", "autoheader"],
+                    ["sh", "-c", "./autogen.sh"],
                     ["sh", "-c", "./configure"], # no --without-ecc
                     ]
         if not os.path.exists(os.path.join(os.path.dirname(__file__), 'DTLSSocket','tinydtls','dtls.c')):
@@ -56,6 +55,7 @@ setup(
                  "DTLSSocket/tinydtls/peer.c",
                  "DTLSSocket/tinydtls/session.c",
                  "DTLSSocket/tinydtls/aes/rijndael.c",
+                 "DTLSSocket/tinydtls/aes/rijndael_wrap.c",
                  "DTLSSocket/tinydtls/sha2/sha2.c",
                  "DTLSSocket/tinydtls/platform-specific/dtls_prng_posix.c",
                  ],
@@ -65,6 +65,7 @@ setup(
                                ('DTLS_CHECK_CONTENTTYPE', '1'),
                                ('_GNU_SOURCE', '1'),
                                 ('NDEBUG', '1'),
+                                ('uint8_t', 'u_int8_t'),
                               ],
 #                undef_macros = [ "NDEBUG" ],
                 ),]