diff --git a/cryptsetup-1.6.0.tar.bz2 b/cryptsetup-1.6.0.tar.bz2
deleted file mode 100644
index 84402cc..0000000
--- a/cryptsetup-1.6.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dd9686fce5d3276b2eb2ac40d513a9b64850af8fff881442f2cfe87257ba2406
-size 1180090
diff --git a/cryptsetup-1.6.0.tar.bz2.asc b/cryptsetup-1.6.0.tar.bz2.asc
deleted file mode 100644
index 6bc8fc9..0000000
--- a/cryptsetup-1.6.0.tar.bz2.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-iQIcBAABCAAGBQJQ8+GfAAoJENmwV3vZPpj86rgQAJUxpurjIPPY5Ak33lI+luWy
-3B0wskGl5ir9ua8fpWARBSdh90V2/fipxbOwhdzuvhyC/+1NcQ27mrmO9B5nRm+s
-Gkrqja0pKOBOJzFqKLL4EwY+m01ys5qMfVtUd22+gav4Ym3uucRrt5GsE9gsn+ww
-ozqibImdijikMYgnxUht+UX/bsBTsDuXNGpp5UrEXImhouOIDr8kCyfbNbcUuZME
-vgN+5krPXQcdgMlianeYq26IqqCQqkFNEW5NtyAPPu5aTgB5W1zvPPaoV+f9ScqY
-8yR66GulXkaFb80DnlOHArKTOYAN3Jah3un0yzqlxpijBSisaaKFviUPzc6TKmtW
-JvXlDWtzpjD/9Tp6wWW8zKRXAoBZbPfa2zH9edyRrDMvWANO/Y71gk65jUktQtAg
-d4VzBzxyStXnTrOxM7eqcPPTxzAqYRMHyGb1dmWhicLf7VrkJNTK9b3YaY94egUV
-nmU+pOD0z6adZAnj3uJuKxlkStwE6JBxSoB+8QSYyK+4KtEo11//BFuRjj8rZqI9
-QnK2h6H1dJLu9k7TpBYrI9T0kkt5iykAD1P65fBwz0wenRPafC3NOz1dQnbuS/r8
-3ydqSmJzAazajqXCuNsceymOV9mo+nwDFhWk/WZxcTe6tZTAC3BTXdDABb4BA9sy
-hRri57LAD9cwzGieICn+
-=qYQN
------END PGP SIGNATURE-----
diff --git a/cryptsetup-1.6.1.tar.bz2 b/cryptsetup-1.6.1.tar.bz2
new file mode 100644
index 0000000..4b491e7
--- /dev/null
+++ b/cryptsetup-1.6.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:baf36e663c03eb6440482d91c486d61ed47ce5c9268ad04c18ca09082755149c
+size 1175052
diff --git a/cryptsetup-1.6.1.tar.bz2.asc b/cryptsetup-1.6.1.tar.bz2.asc
new file mode 100644
index 0000000..24bf94d
--- /dev/null
+++ b/cryptsetup-1.6.1.tar.bz2.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQIcBAABCAAGBQJRWAGYAAoJENmwV3vZPpj8Hw4P/0Xuz48RJZOvf0Hse/3KxCx8
+vmw9h/paJJQ8fD0/eJiVmGep8H4k0qla9uUQSPYPH8ksdSF3P9KVFmGXgUHiuo1D
+55uP/5a+XnUM6fDuVpHnAE4fCrQ1UVXmcgmfxHNjlxRLS7QZ1224Ac9WRf2ucFyD
+PbcNZbC0H1s7MkVhNKA4rQHXTvaF//z8FsJHUhuoKyKnmIPpQbYvqyv3IuDSK0nl
+lRNLBxI7nYgIiZfnUIxJcgfPlqO4q7MSxfGMDj0pNBr6RBN5xex1TRn/Y/642JmR
+FPHsHtuR2RGRZGwj0xKM6XqDN+uD7FKVFCmYD2yL9eC37pFDiT8E2hArDkL7BiuH
+nVeZwVNeOFnqlaP7uzSX7IuutgJyoqbkrE/bYwgPOi808Q/tHC37ZhnD2fUQ4Igc
+AkiozSu3M728PR5CeHhE5T5YWls1rvWxEZ+uERXFudj+hUFtv5MVgzhoeThH8Cor
+AV+DYl2EpD6Rtfu0L2opbNQkSzIH5ibnKJ+M19B6r+2BPi+2kDUoLXwJxZevP/Au
+CHaitOfhTkpqRNipzf+Qqql2/wqUthLKPMMYhuW2moja5LXYX4DLxedCvVC9r78K
+ZtlzJN3OeRLTWVhQeyjTmkx5Gfq6o1mrlXZDBvlDoeILcFwiiK7os4ExbZO+POlx
+RuiODZFBQGU3LSeQfnKy
+=G7bU
+-----END PGP SIGNATURE-----
diff --git a/cryptsetup.changes b/cryptsetup.changes
index cf9badc..de20b32 100644
--- a/cryptsetup.changes
+++ b/cryptsetup.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Jul  2 18:53:21 UTC 2013 - crrodriguez@opensuse.org
+
+- cryptsetup 1.6.1
+ * Fix loop-AES keyfile parsing.
+ * Fix passphrase pool overflow for too long TCRYPT passphrase.
+ * Fix deactivation of device when failed underlying node disappeared.
+
+- There is a bug in the released tarball, due to HAVE_BYTESWAP_H
+  and HAVE_ENDIAN_H not properly handled by the buildsystem. A
+  patch with permanent solution was sent and accepted upstream
+  and will appear in the next release, for now an spec file workaround
+  is in place, remove in the next update.
+
 -------------------------------------------------------------------
 Sun Mar 24 19:17:47 UTC 2013 - jengelh@inai.de
 
diff --git a/cryptsetup.spec b/cryptsetup.spec
index bf48f82..8c5a64d 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -18,7 +18,7 @@
 
 Name:           cryptsetup
 Url:            http://code.google.com/p/cryptsetup/
-Version:        1.6.0
+Version:        1.6.1
 Release:        0
 Summary:        Set Up dm-crypt Based Encrypted Block Devices
 License:        SUSE-GPL-2.0-with-openssl-exception and LGPL-2.0+
@@ -87,6 +87,9 @@ time via the config file /etc/crypttab.
 %{?suse_update_config:%{suse_update_config}}
 autoreconf -f -i
 test -e po/Makevars || cp po/Makevars.template po/Makevars
+##### remove for version > 1.6.1 ######
+export CFLAGS="%optflags -DHAVE_ENDIAN_H -DHAVE_BYTESWAP_H"
+########################################
 %configure \
 	    --disable-static --enable-shared \
 	    --enable-cryptsetup-reencrypt \