diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index 3688cdf..c51abfc 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -1,5 +1,4 @@
-# Match the Fedora's version info.
-#=fedora
+# Check distro name is included in the version output.
 Patch001: gdb-6.3-rh-testversion-20041202.patch
 
 # Add a wrapper script to GDB that implements pstack using the
diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index cb3143d..b72c412 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -1,55 +1,55 @@
-%patch001 -p1
-%patch002 -p1
-%patch003 -p1
-%patch004 -p1
-%patch005 -p1
-%patch006 -p1
-%patch007 -p1
-%patch008 -p1
-%patch009 -p1
-%patch010 -p1
-%patch011 -p1
-%patch012 -p1
-%patch013 -p1
-%patch014 -p1
-%patch015 -p1
-%patch016 -p1
-%patch017 -p1
-%patch018 -p1
-%patch019 -p1
-%patch020 -p1
-%patch021 -p1
-%patch022 -p1
-%patch023 -p1
-%patch024 -p1
-%patch025 -p1
-%patch026 -p1
-%patch027 -p1
-%patch028 -p1
-%patch029 -p1
-%patch030 -p1
-%patch031 -p1
-%patch032 -p1
-%patch033 -p1
-%patch034 -p1
-%patch035 -p1
-%patch036 -p1
-%patch037 -p1
-%patch038 -p1
-%patch039 -p1
-%patch040 -p1
-%patch041 -p1
-%patch042 -p1
-%patch043 -p1
-%patch044 -p1
-%patch045 -p1
-%patch046 -p1
-%patch047 -p1
-%patch048 -p1
-%patch049 -p1
-%patch050 -p1
-%patch051 -p1
-%patch052 -p1
-%patch053 -p1
-%patch054 -p1
-%patch055 -p1
+%patch -p1 -P001
+%patch -p1 -P002
+%patch -p1 -P003
+%patch -p1 -P004
+%patch -p1 -P005
+%patch -p1 -P006
+%patch -p1 -P007
+%patch -p1 -P008
+%patch -p1 -P009
+%patch -p1 -P010
+%patch -p1 -P011
+%patch -p1 -P012
+%patch -p1 -P013
+%patch -p1 -P014
+%patch -p1 -P015
+%patch -p1 -P016
+%patch -p1 -P017
+%patch -p1 -P018
+%patch -p1 -P019
+%patch -p1 -P020
+%patch -p1 -P021
+%patch -p1 -P022
+%patch -p1 -P023
+%patch -p1 -P024
+%patch -p1 -P025
+%patch -p1 -P026
+%patch -p1 -P027
+%patch -p1 -P028
+%patch -p1 -P029
+%patch -p1 -P030
+%patch -p1 -P031
+%patch -p1 -P032
+%patch -p1 -P033
+%patch -p1 -P034
+%patch -p1 -P035
+%patch -p1 -P036
+%patch -p1 -P037
+%patch -p1 -P038
+%patch -p1 -P039
+%patch -p1 -P040
+%patch -p1 -P041
+%patch -p1 -P042
+%patch -p1 -P043
+%patch -p1 -P044
+%patch -p1 -P045
+%patch -p1 -P046
+%patch -p1 -P047
+%patch -p1 -P048
+%patch -p1 -P049
+%patch -p1 -P050
+%patch -p1 -P051
+%patch -p1 -P052
+%patch -p1 -P053
+%patch -p1 -P054
+%patch -p1 -P055
diff --git a/generate-patches-from-git-repo.sh b/generate-patches-from-git-repo.sh
index 52537ca..d399d78 100755
--- a/generate-patches-from-git-repo.sh
+++ b/generate-patches-from-git-repo.sh
@@ -93,7 +93,7 @@ for c in `git rev-list --reverse ${common_ancestor}..HEAD` ; do
 `git log -1 --pretty='format:%b' $c | sed -n 's/^;;/#/p'`
 EOF
     printf "Patch%03d: %s\n\n" $idx $fname >> $temp_PATCH_file
-    printf "%%patch%03d -p1\n" $idx >> $temp_patch_file
+    printf "%%patch -p1 -P%03d\n" $idx >> $temp_patch_file
     echo $fname >> $temp_patch_order_file
     idx=`expr $idx + 1`
 done