diff --git a/packages/security/libgcrypt/patches/libgcrypt-disable-docs.patch b/packages/security/libgcrypt/patches/libgcrypt-disable-docs.patch
new file mode 100644
index 0000000000..6fe71ddbe9
--- /dev/null
+++ b/packages/security/libgcrypt/patches/libgcrypt-disable-docs.patch
@@ -0,0 +1,14 @@
+diff -Naur libgcrypt-1.6.4/Makefile.am libgcrypt-1.6.4.patch/Makefile.am
+--- libgcrypt-1.6.4/Makefile.am	2015-09-07 14:05:57.000000000 +0200
++++ libgcrypt-1.6.4.patch/Makefile.am	2016-01-03 00:00:27.392411468 +0100
+@@ -24,8 +24,8 @@
+ # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
+ GITLOG_TO_CHANGELOG=gitlog-to-changelog
+ 
+-DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
+-SUBDIRS =         compat mpi cipher random src doc tests
++DIST_SUBDIRS = m4 compat mpi cipher random src
++SUBDIRS =         compat mpi cipher random src
+ 
+ EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES      	           \
+              ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011    \
diff --git a/packages/security/libgpg-error/package.mk b/packages/security/libgpg-error/package.mk
index 20e22aca72..19d49254d4 100644
--- a/packages/security/libgpg-error/package.mk
+++ b/packages/security/libgpg-error/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libgpg-error"
-PKG_VERSION="1.20"
+PKG_VERSION="1.21"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-0003-kernel-4.3rc5.patch b/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-0003-kernel-4.3rc5.patch
deleted file mode 100644
index bc9732e2ec..0000000000
--- a/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-0003-kernel-4.3rc5.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/kernel/nv-procfs.c       2015-10-18 04:32:24.214891836 +0100
-+++ b/kernel/nv-procfs.c       2015-10-18 04:33:01.611081468 +0100
-@@ -607,7 +607,12 @@
-     registry_keys = ((nvl != NULL) ?
-             nvl->registry_keys : nv_registry_keys);
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
-     return seq_printf(s, "Binary: \"%s\"\n", registry_keys);
-+#else
-+    seq_printf(s, "Binary: \"%s\"\n", registry_keys);
-+    return 0;
-+#endif
- }
- 
- static ssize_t
-@@ -674,7 +679,12 @@
-     void *v
- )
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
-     return seq_puts(s, s->private);
-+#else
-+    seq_puts(s, s->private);
-+    return 0;
-+#endif
- }
- 
- NV_DEFINE_PROCFS_SINGLE_FILE(text_file);