diff --git a/package/base/alsa-firmware/kernel-shared-hotfix.patch b/package/base/alsa-firmware/kernel-shared-hotfix.patch
new file mode 100644
index 000000000..a0517b2f9
--- /dev/null
+++ b/package/base/alsa-firmware/kernel-shared-hotfix.patch
@@ -0,0 +1,24 @@
+--- ./Makefile.am.orig	2009-03-25 09:11:12.000000000 +0100
++++ ./Makefile.am	2009-03-25 09:11:24.000000000 +0100
+@@ -1,8 +1,7 @@
+ AUTOMAKE_OPTIONS = 1.3 foreign
+ 
+ SUBDIRS = hdsploader mixartloader pcxhrloader usx2yloader vxloader echoaudio \
+-	  asihpi emi_26_62 emu korg1212 maestro3 multisound sb16 wavefront \
+-	  ymfpci aica
++	  asihpi emi_26_62 emu multisound sb16 wavefront aica
+ 
+ EXTRA_DIST = depcomp
+ 
+--- ./Makefile.in.orig	2009-03-25 09:11:27.000000000 +0100
++++ ./Makefile.in	2009-03-25 09:11:38.000000000 +0100
+@@ -158,8 +158,7 @@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = 1.3 foreign
+ SUBDIRS = hdsploader mixartloader pcxhrloader usx2yloader vxloader echoaudio \
+-	  asihpi emi_26_62 emu korg1212 maestro3 multisound sb16 wavefront \
+-	  ymfpci aica
++	  asihpi emi_26_62 emu multisound sb16 wavefront aica
+ 
+ EXTRA_DIST = depcomp
+ all: all-recursive
diff --git a/package/x11/libdrm/kernel-shared-hotfix.patch b/package/x11/libdrm/kernel-shared-hotfix.patch
new file mode 100644
index 000000000..102e2bd91
--- /dev/null
+++ b/package/x11/libdrm/kernel-shared-hotfix.patch
@@ -0,0 +1,37 @@
+--- ./shared-core/Makefile.am.orig	2009-03-25 09:01:44.000000000 +0100
++++ ./shared-core/Makefile.am	2009-03-25 09:07:27.000000000 +0100
+@@ -24,15 +24,6 @@
+ 
+ klibdrmincludedir = ${includedir}/drm
+ klibdrminclude_HEADERS = \
+-                         drm.h \
+-                         drm_sarea.h \
+-                         i915_drm.h \
+                          mach64_drm.h \
+-                         mga_drm.h \
+-                         r128_drm.h \
+-                         radeon_drm.h \
+-                         savage_drm.h \
+-                         sis_drm.h \
+-                         via_drm.h \
+                          r300_reg.h \
+                          via_3d_reg.h
+--- ./shared-core/Makefile.in.orig	2009-03-25 09:01:56.000000000 +0100
++++ ./shared-core/Makefile.in	2009-03-25 09:08:03.000000000 +0100
+@@ -183,16 +183,7 @@
+ target_alias = @target_alias@
+ klibdrmincludedir = ${includedir}/drm
+ klibdrminclude_HEADERS = \
+-                         drm.h \
+-                         drm_sarea.h \
+-                         i915_drm.h \
+                          mach64_drm.h \
+-                         mga_drm.h \
+-                         r128_drm.h \
+-                         radeon_drm.h \
+-                         savage_drm.h \
+-                         sis_drm.h \
+-                         via_drm.h \
+                          r300_reg.h \
+                          via_3d_reg.h
+