diff --git a/filesystem/dvd+rwtools/glibc-2.9.patch b/filesystem/dvd+rwtools/glibc-2.9.patch
new file mode 100644
index 000000000..bea1cc141
--- /dev/null
+++ b/filesystem/dvd+rwtools/glibc-2.9.patch
@@ -0,0 +1,36 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../dvd+rwtools/glibc-2.9.patch
+# Copyright (C) 2007 - 2009 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+--- ./growisofs.c.orig        2006-09-24 19:28:53.000000000 +0200
++++ ./growisofs.c    2008-01-08 00:56:57.000000000 +0100
+@@ -418,6 +418,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <assert.h>
++#include <limits.h>
+ #include "mp.h"
+ 
+ #if defined(__unix) || defined(__unix__)
+--- ./transport.hxx.orig      2006-09-23 13:29:07.000000000 +0200
++++ ./transport.hxx  2008-01-08 00:57:36.000000000 +0100
+@@ -137,6 +137,7 @@
+ #include <sys/wait.h>
+ #include <sys/utsname.h>
+ #include <scsi/sg.h>
++#include <limits.h>
+ #if !defined(SG_FLAG_LUN_INHIBIT)
+ # if defined(SG_FLAG_UNUSED_LUN_INHIBIT)
+ #  define SG_FLAG_LUN_INHIBIT SG_FLAG_UNUSED_LUN_INHIBIT
+
diff --git a/filesystem/dvd+rwtools/sg_h_fix.patch b/filesystem/dvd+rwtools/sg_h_fix.patch
deleted file mode 100644
index 4d449de17..000000000
--- a/filesystem/dvd+rwtools/sg_h_fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../dvd+rwtools/sg_h_fix.patch
-# Copyright (C) 2007 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-# Patch by Kickah
-diff -Nur dvd+rw-tools-7.0.orig/transport.hxx dvd+rw-tools-7.0/transport.hxx
---- dvd+rw-tools-7.0.orig/transport.hxx	2006-12-10 23:18:18.000000000 +0000
-+++ dvd+rw-tools-7.0/transport.hxx	2006-12-10 23:19:05.000000000 +0000
-@@ -284,9 +284,9 @@
- #if !KERNEL_BROKEN
- 		if (sg_io.masked_status&CHECK_CONDITION)
- #endif
--		{   ret = ERRCODE(sg_io.sbp);
-+		{   ret = ERRCODE((unsigned char *)sg_io.sbp);
- 		    if (ret==0) ret=-1;
--		    else	CREAM_ON_ERRNO(sg_io.sbp);
-+		    else	CREAM_ON_ERRNO((unsigned char *)sg_io.sbp);
- 		}
- 	    }
- 	    return ret;