diff --git a/ChangeLog b/ChangeLog
index 5027446..d5b90bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,7 @@ Changes in version 1.9.4 -
     Several minor fixes and improvements.
 
 + bugfix
-  * templates/kde4 - Davide Madrisan:
+  * templates/{gnome,kde*,library,standard,standard-daemon} - Davide Madrisan:
     Move %debug_package macro after all %description blocks.
 
 --------------------------------------------------------------------------------
diff --git a/templates/gnome b/templates/gnome
index 1b5d869..0283820 100644
--- a/templates/gnome
+++ b/templates/gnome
@@ -22,10 +22,6 @@ License:       GPL
 BuildRequires: gtk-doc
 BuildRoot:     @rpm_default_buildroot@
 
-@if:debug_package
-%debug_package
-@fi:debug_package
-
 %description
 ...
 
@@ -39,6 +35,10 @@ Requires:      gtk-doc
 %{pkgname} API documentation.
 @fi:library_apidocs
 
+@if:debug_package
+%debug_package
+@fi:debug_package
+
 %prep
 %setup -q -n %{pkgname}-%{version}
 
diff --git a/templates/kde3 b/templates/kde3
index 113a108..c79666e 100644
--- a/templates/kde3
+++ b/templates/kde3
@@ -15,13 +15,13 @@ License:       ...
 ## AUTOBUILDREQ-END
 BuildRoot:     @rpm_default_buildroot@
 
+%description
+...
+
 @if:debug_package
 %debug_package
 @fi:debug_package
 
-%description
-...
-
 %prep
 %setup -q
 #%patch0 -p1
diff --git a/templates/library b/templates/library
index 2cdd088..f9933fa 100644
--- a/templates/library
+++ b/templates/library
@@ -28,10 +28,6 @@ Requires(post): %{__install_info}
 @fi:infopages
 BuildRoot:     @rpm_default_buildroot@
 
-@if:debug_package
-%debug_package
-@fi:debug_package
-
 %description
 ...
 
@@ -89,6 +85,10 @@ Requires:      gtk-doc
 This package includes the %{name} API documentation.
 @fi:pck_apidocs
 
+@if:debug_package
+%debug_package
+@fi:debug_package
+
 %prep
 %setup -q
 #%patch0 -p1
diff --git a/templates/standard b/templates/standard
index d7d6750..e3f4e3a 100644
--- a/templates/standard
+++ b/templates/standard
@@ -21,10 +21,6 @@ Requires(post): %{__install_info}
 @fi:infopages
 BuildRoot:     @rpm_default_buildroot@
 
-@if:debug_package
-%debug_package
-@fi:debug_package
-
 %description
 ...
 
@@ -39,6 +35,10 @@ Requires:      gtk-doc
 This package includes the %{name} API documentation.
 @fi:pck_apidocs
 
+@if:debug_package
+%debug_package
+@fi:debug_package
+
 %prep
 %setup -q
 #%patch0 -p1
diff --git a/templates/standard-daemon b/templates/standard-daemon
index 0aa5844..a48d7d4 100644
--- a/templates/standard-daemon
+++ b/templates/standard-daemon
@@ -21,10 +21,6 @@ Requires(post): %{__install_info}
 @fi:infopages
 BuildRoot:     @rpm_default_buildroot@
 
-@if:debug_package
-%debug_package
-@fi:debug_package
-
 %description
 ...
 
@@ -39,6 +35,10 @@ Requires:      gtk-doc
 This package includes the %{name} API documentation.
 @fi:pck_apidocs
 
+@if:debug_package
+%debug_package
+@fi:debug_package
+
 %prep
 %setup -q
 #%patch0 -p1