From 1f9bc2f0e48a166bd7fb683833579ce1773d2a06 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 11 Dec 2011 11:12:58 +0100
Subject: [PATCH] Add a -debuginfo for every package that is not noarch.

And fix some whitespace errors as well.
---
 ImageMagick/ImageMagick.nm                    |   6 +-
 MAKEDEV/MAKEDEV.nm                            |   6 +-
 X11vnc/X11vnc.nm                              |   4 +
 acl/acl.nm                                    |  10 +-
 acpid/acpid.nm                                |   4 +
 aiccu/aiccu.nm                                |   4 +
 attr/attr.nm                                  |   8 +-
 audit/audit.nm                                |   6 +-
 authconfig/authconfig.nm                      |   6 +-
 autogen/autogen.nm                            |   4 +
 avahi/avahi.nm                                |   8 +-
 bash/bash.nm                                  |   4 +
 bc/bc.nm                                      |   4 +
 beecrypt/beecrypt.nm                          |   4 +
 beep/beep.nm                                  |   4 +
 bind/bind.nm                                  |   6 +-
 binutils/binutils.nm                          |   4 +
 bird/bird.nm                                  |   4 +
 bison/bison.nm                                |   4 +
 boost/boost.nm                                |   6 +-
 br2684ctl/br2684ctl.nm                        |   4 +
 bridge-utils/bridge-utils.nm                  |   4 +
 btrfs-progs/btrfs-progs.nm                    |   4 +
 bwm-ng/bwm-ng.nm                              |   4 +
 bzip2/bzip2.nm                                |   4 +
 c_icap/c_icap.nm                              |   4 +
 c_icap_modules/c_icap_modules.nm              |   4 +
 cairo/cairo.nm                                |   6 +-
 ccache/ccache.nm                              |   4 +
 chrony/chrony.nm                              |  12 +-
 chrpath/chrpath.nm                            |   4 +
 clamav/clamav.nm                              |   8 +-
 cloog-ppl/cloog-ppl.nm                        |   4 +
 cmake/cmake.nm                                |   4 +
 coreutils/coreutils.nm                        |   4 +
 cpio/cpio.nm                                  |   4 +
 cpufrequtils/cpufrequtils.nm                  |   6 +-
 cracklib/cracklib.nm                          |  14 +-
 crda/crda.nm                                  |   4 +
 cronie/cronie.nm                              |   4 +
 cryptsetup-luks/cryptsetup-luks.nm            |   6 +-
 cups/cups.nm                                  |   8 +-
 curl/curl.nm                                  |  10 +-
 cyrus-sasl/cyrus-sasl.nm                      |   6 +-
 dansguardian/dansguardian.nm                  |   4 +
 db4/db4.nm                                    |  10 +-
 dbus-glib/dbus-glib.nm                        |   8 +-
 dbus/dbus.nm                                  |  14 +-
 dejagnu/dejagnu.nm                            |   2 +-
 dhcp/dhcp.nm                                  |   8 +-
 dhcping/dhcping.nm                            |   4 +
 dialog/dialog.nm                              |   4 +
 diffutils/diffutils.nm                        |   4 +
 directfb/directfb.nm                          |   4 +
 dmidecode/dmidecode.nm                        |   4 +
 dmraid/dmraid.nm                              |   6 +-
 docbook-dtds/docbook-dtds.nm                  |   4 +-
 docbook-utils/docbook-utils.nm                |   4 +
 dos2unix/dos2unix.nm                          |   4 +
 dosfstools/dosfstools.nm                      |   4 +
 dracut/dracut.nm                              |  12 +-
 dvdrtools/dvdrtools.nm                        |   4 +
 e2fsprogs/e2fsprogs.nm                        |   6 +-
 ebtables/ebtables.nm                          |   4 +
 ed/ed.nm                                      |   4 +
 eggdbus/eggdbus.nm                            |   6 +-
 eject/eject.nm                                |   4 +
 elfutils/elfutils.nm                          |   6 +-
 elinks/elinks.nm                              |   4 +
 etherwake/etherwake.nm                        |   4 +
 ethtool/ethtool.nm                            |   4 +
 expat/expat.nm                                |   6 +-
 expect/expect.nm                              |   4 +
 ez-ipupdate/ez-ipupdate.nm                    |   4 +
 fail2ban/fail2ban.nm                          |   4 +
 file/file.nm                                  |   4 +
 filesystem/filesystem.nm                      |   7 +-
 findutils/findutils.nm                        |   4 +
 firewall/firewall.nm                          |   4 +
 flex/flex.nm                                  |   6 +-
 fontconfig/fontconfig.nm                      |   6 +-
 freeradius/freeradius.nm                      |  10 +-
 freetype/freetype.nm                          |   6 +-
 fuse-sshfs/fuse-sshfs.nm                      |   4 +
 fuse/fuse.nm                                  |   6 +-
 gawk/gawk.nm                                  |   4 +
 gcc/gcc.nm                                    |   4 +
 gdb/gdb.nm                                    |   4 +
 gdbm/gdbm.nm                                  |   6 +-
 gdk-pixbuf2/gdk-pixbuf2.nm                    |   6 +-
 gettext/gettext.nm                            |   6 +-
 ghostscript/ghostscript.nm                    |   4 +
 git/git.nm                                    |   7 +-
 glib2/glib2.nm                                |   4 +
 glibc/glibc.nm                                |   6 +-
 gmp/gmp.nm                                    |   4 +
 gnupg2/gnupg2.nm                              |   4 +
 gnutls/gnutls.nm                              |   4 +
 .../gobject-introspection.nm                  |   8 +-
 gperf/gperf.nm                                |   4 +
 grep/grep.nm                                  |   4 +
 groff/groff.nm                                |   4 +
 grub/grub.nm                                  |   4 +
 grubby/grubby.nm                              |  10 +-
 gssdp/gssdp.nm                                |   6 +-
 guile/guile.nm                                |   4 +
 gupnp-av/gupnp-av.nm                          |   6 +-
 gupnp-igd/gupnp-igd.nm                        |   6 +-
 gupnp/gupnp.nm                                |   6 +-
 gzip/gzip.nm                                  |   4 +
 hdparm/hdparm.nm                              |   4 +
 help2man/help2man.nm                          |   4 +
 hostapd/hostapd.nm                            |   4 +
 hplip/hplip.nm                                |   4 +
 htop/htop.nm                                  |   4 +
 ibod/ibod.nm                                  |   6 +-
 icecream/icecream.nm                          |   6 +-
 iftop/iftop.nm                                |   4 +
 igmpproxy/igmpproxy.nm                        |   4 +
 initscripts/initscripts.nm                    |   4 +
 iperf/iperf.nm                                |   4 +
 iproute2/iproute2.nm                          |   4 +
 iptables/iptables.nm                          |   6 +-
 iputils/iputils.nm                            |   4 +
 .../iscsi-initiator-utils.nm                  |  12 +-
 isdn4k-utils/isdn4k-utils.nm                  |  14 +-
 iw/iw.nm                                      |   4 +
 joe/joe.nm                                    |   4 +
 jwhois/jwhois.nm                              |   4 +
 kbd/kbd.nm                                    |   4 +
 keepalived/keepalived.nm                      |   4 +
 ldapvi/ldapvi.nm                              |   4 +
 less/less.nm                                  |   4 +
 libICE/libICE.nm                              |   6 +-
 libSM/libSM.nm                                |   6 +-
 libVNCServer/libVNCServer.nm                  |   6 +-
 libX11/libX11.nm                              |   6 +-
 libXau/libXau.nm                              |   6 +-
 libXaw/libXaw.nm                              |   6 +-
 libXdamage/libXdamage.nm                      |   6 +-
 libXdmcp/libXdmcp.nm                          |   6 +-
 libXext/libXext.nm                            |   6 +-
 libXfixes/libXfixes.nm                        |   6 +-
 libXfont/libXfont.nm                          |   6 +-
 libXft/libXft.nm                              |   6 +-
 libXi/libXi.nm                                |   6 +-
 libXmu/libXmu.nm                              |   6 +-
 libXpm/libXpm.nm                              |   6 +-
 libXrandr/libXrandr.nm                        |   6 +-
 libXrender/libXrender.nm                      |   6 +-
 libXres/libXres.nm                            |   6 +-
 libXt/libXt.nm                                |   6 +-
 libXtst/libXtst.nm                            |   6 +-
 libXv/libXv.nm                                |   6 +-
 libXvMC/libXvMC.nm                            |   6 +-
 libXxf86vm/libXxf86vm.nm                      |   6 +-
 libaal/libaal.nm                              |   6 +-
 libaio/libaio.nm                              |   6 +-
 libarchive/libarchive.nm                      |   6 +-
 libart/libart.nm                              |   6 +-
 libassuan/libassuan.nm                        |   6 +-
 libatasmart/libatasmart.nm                    |   6 +-
 libcap-ng/libcap-ng.nm                        |   6 +-
 libcap/libcap.nm                              |   4 +
 libcgroup/libcgroup.nm                        |   6 +-
 libcroco/libcroco.nm                          |   8 +-
 libdaemon/libdaemon.nm                        |   6 +-
 libdnet/libdnet.nm                            |   6 +-
 libdrm/libdrm.nm                              |   6 +-
 libedit/libedit.nm                            |   8 +-
 libevent/libevent.nm                          |   6 +-
 libffi/libffi.nm                              |   8 +-
 libfontenc/libfontenc.nm                      |   6 +-
 libgcrypt/libgcrypt.nm                        |   8 +-
 libgpg-error/libgpg-error.nm                  |   6 +-
 libgssglue/libgssglue.nm                      |   6 +-
 libidn/libidn.nm                              |   6 +-
 libjpeg/libjpeg.nm                            |   6 +-
 libksba/libksba.nm                            |   6 +-
 libmng/libmng.nm                              |   6 +-
 libmpc/libmpc.nm                              |   4 +
 libnet/libnet.nm                              |   6 +-
 .../libnetfilter_conntrack.nm                 |   6 +-
 libnetfilter_log/libnetfilter_log.nm          |   6 +-
 libnetfilter_queue/libnetfilter_queue.nm      |   6 +-
 libnfnetlink/libnfnetlink.nm                  |   6 +-
 libnfsidmap/libnfsidmap.nm                    |   6 +-
 libnl/libnl.nm                                |   6 +-
 libpcap/libpcap.nm                            |   6 +-
 libpciaccess/libpciaccess.nm                  |   6 +-
 libpipeline/libpipeline.nm                    |   6 +-
 libpng/libpng.nm                              |   6 +-
 librpcsecgss/librpcsecgss.nm                  |   6 +-
 librsvg2/librsvg2.nm                          |   8 +-
 libselinux/libselinux.nm                      |  14 +-
 libsemanage/libsemanage.nm                    |  10 +-
 libsepol/libsepol.nm                          |   6 +-
 libsigc++/libsigc++.nm                        |   6 +-
 libsolv/libsolv.nm                            |   6 +-
 libsoup/libsoup.nm                            |   8 +-
 libssh2/libssh2.nm                            |   6 +-
 libtasn1/libtasn1.nm                          |   6 +-
 libtiff/libtiff.nm                            |   6 +-
 libtool/libtool.nm                            |   4 +
 libtorrent/libtorrent.nm                      |   6 +-
 libusb-compat/libusb-compat.nm                |   6 +-
 libusb/libusb.nm                              |   6 +-
 libuser/libuser.nm                            |   6 +-
 libvirt/libvirt.nm                            |   6 +-
 libxcb/libxcb.nm                              |   8 +-
 libxkbfile/libxkbfile.nm                      |   6 +-
 libxml2/libxml2.nm                            |   6 +-
 libxslt/libxslt.nm                            |   6 +-
 libyaml/libyaml.nm                            |   6 +-
 lighttpd/lighttpd.nm                          |  12 +-
 linux-atm/linux-atm.nm                        |   6 +-
 linux-firmware/linux-firmware.nm              |   4 +
 lldpd/lldpd.nm                                |   4 +
 lm-sensors/lm-sensors.nm                      |   4 +
 logrotate/logrotate.nm                        |   4 +
 lsof/lsof.nm                                  |   4 +
 lua/lua.nm                                    |  10 +-
 lvm2/lvm2.nm                                  |   8 +-
 lzo/lzo.nm                                    |   4 +
 m4/m4.nm                                      |   4 +
 make/make.nm                                  |   4 +
 man-db/man-db.nm                              |   4 +
 mc/mc.nm                                      |   6 +-
 mdadm/mdadm.nm                                |   6 +-
 memtest86+/memtest86+.nm                      |   4 +
 mesa/mesa.nm                                  |   4 +
 minicom/minicom.nm                            |   4 +
 module-init-tools/module-init-tools.nm        |   4 +
 mpfr/mpfr.nm                                  |   6 +-
 mstpd/mstpd.nm                                |   4 +
 multipath-tools/multipath-tools.nm            |   6 +-
 nano/nano.nm                                  |   4 +
 nasm/nasm.nm                                  |   4 +
 ncurses/ncurses.nm                            |  10 +-
 net-snmp/net-snmp.nm                          |   4 +
 net-tools/net-tools.nm                        |   4 +
 netplug/netplug.nm                            |   4 +
 nettle/nettle.nm                              |   4 +
 newt/newt.nm                                  |   4 +
 nfs-utils/nfs-utils.nm                        |   4 +
 nmap/nmap.nm                                  |   4 +
 noip/noip.nm                                  |   4 +
 nspr/nspr.nm                                  |   4 +
 nss-myhostname/nss-myhostname.nm              |   4 +
 nss-softokn/nss-softokn.nm                    |   4 +
 nss-util/nss-util.nm                          |   4 +
 nss/nss.nm                                    |   6 +-
 nss_ldap/nss_ldap.nm                          |   4 +
 open-vm-tools/open-vm-tools.nm                |   4 +
 openjade/openjade.nm                          |   6 +-
 openl2tp/openl2tp.nm                          |   4 +
 openldap/openldap.nm                          |   4 +
 opensp/opensp.nm                              |   4 +
 openssh/openssh.nm                            |  14 +-
 openssl/openssl.nm                            |   4 +
 openvpn/openvpn.nm                            |   4 +
 os-prober/os-prober.nm                        |   4 +
 p11-kit/p11-kit.nm                            |   4 +
 pakfire/pakfire.nm                            |   4 +
 pam/pam.nm                                    |   4 +
 pam_ldap/pam_ldap.nm                          |   4 +
 pango/pango.nm                                |   8 +-
 parted/parted.nm                              |   6 +-
 passwd/passwd.nm                              |   4 +
 patch/patch.nm                                |   4 +
 pax-utils/pax-utils.nm                        |   4 +
 paxctl/paxctl.nm                              |   4 +
 paxtest/paxtest.nm                            |   4 +
 pcapy/pcapy.nm                                |   4 +
 pciutils/pciutils.nm                          |   8 +-
 pcre/pcre.nm                                  |   4 +
 pdns-recursor/pdns-recursor.nm                |   4 +
 pdns/pdns.nm                                  |   4 +
 perl-HTML-Parser/perl-HTML-Parser.nm          |   4 +
 perl-XML-Parser/perl-XML-Parser.nm            |   4 +
 perl/perl.nm                                  | 180 +++++++++---------
 pinentry/pinentry.nm                          |   4 +
 pixman/pixman.nm                              |   6 +-
 pkg-config/pkg-config.nm                      |   4 +
 polkit/polkit.nm                              |   6 +-
 popt/popt.nm                                  |   6 +-
 powertop/powertop.nm                          |   4 +
 ppl/ppl.nm                                    |   4 +
 ppp/ppp.nm                                    |   6 +-
 pptp/pptp.nm                                  |   4 +
 procps/procps.nm                              |   4 +
 psmisc/psmisc.nm                              |   4 +
 pth/pth.nm                                    |   6 +-
 pyQt/pyQt.nm                                  |   8 +-
 pyfire/pyfire.nm                              |   4 +
 pygobject2/pygobject2.nm                      |  10 +-
 pyliblzma/pyliblzma.nm                        |   4 +
 python-cairo/python-cairo.nm                  |   6 +-
 python-cryptsetup/python-cryptsetup.nm        |   4 +
 python-dbus/python-dbus.nm                    |   6 +-
 python-gudev/python-gudev.nm                  |   4 +
 python-m2crypto/python-m2crypto.nm            |   4 +
 .../python-netfilter_conntrack.nm             |   4 +
 python-parted/python-parted.nm                |   4 +
 python-piksemel/python-piksemel.nm            |   4 +
 python-pyaspects/python-pyaspects.nm          |   4 +
 python-pyblock/python-pyblock.nm              |   4 +
 python-pycurl/python-pycurl.nm                |   4 +
 python-qtermwidget/python-qtermwidget.nm      |   4 +
 python/python.nm                              |   6 +-
 pyxattr/pyxattr.nm                            |   4 +
 qemu/qemu.nm                                  |   4 +
 qt/qt.nm                                      |   8 +-
 qtermwidget/qtermwidget.nm                    |   6 +-
 quagga/quagga.nm                              |   4 +
 radvd/radvd.nm                                |   4 +
 readline/readline.nm                          |   4 +
 reiser4progs/reiser4progs.nm                  |   6 +-
 reiserfsprogs/reiserfsprogs.nm                |   4 +
 rrdtool/rrdtool.nm                            |   8 +-
 rsync/rsync.nm                                |   4 +
 rsyslog/rsyslog.nm                            |   4 +
 rtorrent/rtorrent.nm                          |   4 +
 samba/samba.nm                                |   4 +
 sane/sane.nm                                  |   8 +-
 screen/screen.nm                              |   4 +
 sdl/sdl.nm                                    |   6 +-
 sed/sed.nm                                    |   4 +
 setup/setup.nm                                |   4 +
 sg3-utils/sg3-utils.nm                        |   8 +-
 sgml-common/sgml-common.nm                    |   2 +-
 shadow-utils/shadow-utils.nm                  |   4 +
 sip/sip.nm                                    |  10 +-
 slang/slang.nm                                |   6 +-
 smartmontools/smartmontools.nm                |   4 +
 sqlite/sqlite.nm                              |   4 +
 squashfs-tools/squashfs-tools.nm              |   4 +
 squid/squid.nm                                |   6 +-
 squidGuard/squidGuard.nm                      |   4 +
 strace/strace.nm                              |   4 +
 strongswan/strongswan.nm                      |   4 +
 sudo/sudo.nm                                  |   4 +
 suricata/suricata.nm                          |   6 +-
 swig/swig.nm                                  |   4 +
 sysfsutils/sysfsutils.nm                      |   6 +-
 syslinux/syslinux.nm                          |   6 +-
 systemd/systemd.nm                            |  10 +-
 sysvinit/sysvinit.nm                          |   4 +
 tar/tar.nm                                    |   4 +
 tcl/tcl.nm                                    |   4 +
 tcpdump/tcpdump.nm                            |   4 +
 telnet/telnet.nm                              |   4 +
 texinfo/texinfo.nm                            |   4 +
 tinc/tinc.nm                                  |   4 +
 traceroute/traceroute.nm                      |   4 +
 transmission/transmission.nm                  |   4 +
 tunctl/tunctl.nm                              |   4 +
 udev/udev.nm                                  |   4 +
 udisks/udisks.nm                              |   4 +
 ulogd2/ulogd2.nm                              |   4 +
 unzip/unzip.nm                                |   4 +
 upower/upower.nm                              |   8 +-
 usb-modeswitch/usb-modeswitch.nm              |   4 +
 usbutils/usbutils.nm                          |   4 +
 ustr/ustr.nm                                  |   8 +-
 util-linux/util-linux.nm                      |  16 +-
 vala/vala.nm                                  |   6 +-
 vim/vim.nm                                    |   4 +
 vlan/vlan.nm                                  |   4 +
 vsftpd/vsftpd.nm                              |   4 +
 wavemon/wavemon.nm                            |   4 +
 wget/wget.nm                                  |   4 +
 which/which.nm                                |   4 +
 wireless-tools/wireless-tools.nm              |   6 +-
 wpa_supplicant/wpa_supplicant.nm              |   4 +
 xcb-util/xcb-util.nm                          |   6 +-
 xen/xen.nm                                    |   4 +
 xfsprogs/xfsprogs.nm                          |   6 +-
 xmlto/xmlto.nm                                |   4 +
 xorg-x11-drv-ati/xorg-x11-drv-ati.nm          |   4 +
 xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm      |   4 +
 xorg-x11-drv-intel/xorg-x11-drv-intel.nm      |   4 +
 .../xorg-x11-drv-keyboard.nm                  |   4 +
 xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm      |   4 +
 xorg-x11-drv-nv/xorg-x11-drv-nv.nm            |   4 +
 .../xorg-x11-drv-synaptics.nm                 |   6 +-
 xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm        |   4 +
 xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm    |   4 +
 xorg-x11-font-utils/xorg-x11-font-utils.nm    |   6 +-
 xorg-x11-fonts/xorg-x11-fonts.nm              |   6 +-
 xorg-x11-server/xorg-x11-server.nm            |   8 +-
 xorg-x11-xinit/xorg-x11-xinit.nm              |   4 +
 xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm      |   4 +
 xrandr/xrandr.nm                              |   4 +
 xterm/xterm.nm                                |   4 +
 xz/xz.nm                                      |   4 +
 zerofree/zerofree.nm                          |   4 +
 zlib/zlib.nm                                  |   6 +-
 398 files changed, 1935 insertions(+), 357 deletions(-)

diff --git a/ImageMagick/ImageMagick.nm b/ImageMagick/ImageMagick.nm
index dc5ecfffe..c5d75ad0d 100644
--- a/ImageMagick/ImageMagick.nm
+++ b/ImageMagick/ImageMagick.nm
@@ -42,8 +42,12 @@ end
 
 packages
 	package %{name}
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/MAKEDEV/MAKEDEV.nm b/MAKEDEV/MAKEDEV.nm
index 7d82cab49..4cf562732 100644
--- a/MAKEDEV/MAKEDEV.nm
+++ b/MAKEDEV/MAKEDEV.nm
@@ -8,7 +8,7 @@ version    = 3.24
 release    = 1
 
 groups     = System/Base
-url        = 
+url        =
 license    = GPLv2
 summary    = A program used for creating device files in /dev.
 
@@ -60,4 +60,8 @@ packages
 				-c "virtual console memory owner" vcsa 2>/dev/null
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/X11vnc/X11vnc.nm b/X11vnc/X11vnc.nm
index f4b2b7795..e38dd26e7 100644
--- a/X11vnc/X11vnc.nm
+++ b/X11vnc/X11vnc.nm
@@ -53,4 +53,8 @@ packages
 			xorg-x11-server
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/acl/acl.nm b/acl/acl.nm
index f75a039ff..069b9635c 100644
--- a/acl/acl.nm
+++ b/acl/acl.nm
@@ -47,12 +47,18 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package libacl
 		template LIBS
 	end
-	
+
 	package libacl-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+
+		provides += libacl-debuginfo
+	end
 end
diff --git a/acpid/acpid.nm b/acpid/acpid.nm
index 01f28f74a..4e41f98fc 100644
--- a/acpid/acpid.nm
+++ b/acpid/acpid.nm
@@ -37,4 +37,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/aiccu/aiccu.nm b/aiccu/aiccu.nm
index 7334bfd31..a879172aa 100644
--- a/aiccu/aiccu.nm
+++ b/aiccu/aiccu.nm
@@ -40,4 +40,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/attr/attr.nm b/attr/attr.nm
index cc27de0a5..9a6a8de59 100644
--- a/attr/attr.nm
+++ b/attr/attr.nm
@@ -46,8 +46,14 @@ end
 packages
 	package lib%{name}
 	end
-	
+
 	package lib%{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+
+		provides += libattr-debuginfo
+	end
 end
diff --git a/audit/audit.nm b/audit/audit.nm
index 04d258f43..5e36fbb1b 100644
--- a/audit/audit.nm
+++ b/audit/audit.nm
@@ -63,8 +63,12 @@ packages
 	package %{name}-libs
 		template LIBS
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/authconfig/authconfig.nm b/authconfig/authconfig.nm
index f89d1aba5..12b7230cb 100644
--- a/authconfig/authconfig.nm
+++ b/authconfig/authconfig.nm
@@ -68,8 +68,12 @@ packages
 	package %{name}
 		requires += newt-python
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/autogen/autogen.nm b/autogen/autogen.nm
index 6e6ee13eb..3dec57f83 100644
--- a/autogen/autogen.nm
+++ b/autogen/autogen.nm
@@ -31,4 +31,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/avahi/avahi.nm b/avahi/avahi.nm
index 2ca00ecff..a0d4e98b8 100644
--- a/avahi/avahi.nm
+++ b/avahi/avahi.nm
@@ -59,12 +59,16 @@ packages
 	package %{name}
 		requires = libdaemon>=0.14
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
-	
+
 	package %{name}-libs
 		template LIBS
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/bash/bash.nm b/bash/bash.nm
index d9d33b34c..0aa49f040 100644
--- a/bash/bash.nm
+++ b/bash/bash.nm
@@ -110,4 +110,8 @@ packages
 			mv -f /etc/shells{.$$,}
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/bc/bc.nm b/bc/bc.nm
index 71d89a402..9b91ebd4c 100644
--- a/bc/bc.nm
+++ b/bc/bc.nm
@@ -40,4 +40,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/beecrypt/beecrypt.nm b/beecrypt/beecrypt.nm
index 0235e0797..8cfe957f8 100644
--- a/beecrypt/beecrypt.nm
+++ b/beecrypt/beecrypt.nm
@@ -52,4 +52,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/beep/beep.nm b/beep/beep.nm
index 6de82eeff..6cdf5d94c 100644
--- a/beep/beep.nm
+++ b/beep/beep.nm
@@ -40,4 +40,8 @@ end
 
 packages
 	package beep
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/bind/bind.nm b/bind/bind.nm
index 2799b0e70..8563b7c26 100644
--- a/bind/bind.nm
+++ b/bind/bind.nm
@@ -142,7 +142,7 @@ build
 		tar -C %{BUILDROOT} -xaf %{DIR_DL}/bind-config-8.tar.bz2
 		touch %{BUILDROOT}/etc/rndc.key
 		touch %{BUILDROOT}/etc/rndc.conf
-		
+
 		mkdir %{BUILDROOT}/etc/named
 		install -m 644 bind.keys %{BUILDROOT}/etc/named.iscdlv.key
 		install -m 644 %{DIR_SOURCE}/trusted-key.key %{BUILDROOT}/etc/trusted-key.key
@@ -215,4 +215,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/binutils/binutils.nm b/binutils/binutils.nm
index 0fd97ded7..8879700fe 100644
--- a/binutils/binutils.nm
+++ b/binutils/binutils.nm
@@ -94,4 +94,8 @@ packages
 			/usr/lib/*.a
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/bird/bird.nm b/bird/bird.nm
index b6bcb7f26..72046aa46 100644
--- a/bird/bird.nm
+++ b/bird/bird.nm
@@ -81,4 +81,8 @@ packages
 			/bin/systemctl reload-or-try-restart bird6.service >/dev/null 2>&1 || :
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/bison/bison.nm b/bison/bison.nm
index ab7ad3c7f..733595702 100644
--- a/bison/bison.nm
+++ b/bison/bison.nm
@@ -47,4 +47,8 @@ packages
 	package %{name}
 		requires += m4
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/boost/boost.nm b/boost/boost.nm
index 0493c0859..452ef254b 100644
--- a/boost/boost.nm
+++ b/boost/boost.nm
@@ -69,8 +69,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/br2684ctl/br2684ctl.nm b/br2684ctl/br2684ctl.nm
index 556f94ce9..6cf052cb0 100644
--- a/br2684ctl/br2684ctl.nm
+++ b/br2684ctl/br2684ctl.nm
@@ -44,4 +44,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/bridge-utils/bridge-utils.nm b/bridge-utils/bridge-utils.nm
index 4f55a6340..65f017589 100644
--- a/bridge-utils/bridge-utils.nm
+++ b/bridge-utils/bridge-utils.nm
@@ -43,4 +43,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/btrfs-progs/btrfs-progs.nm b/btrfs-progs/btrfs-progs.nm
index c76feb7be..ae9961441 100644
--- a/btrfs-progs/btrfs-progs.nm
+++ b/btrfs-progs/btrfs-progs.nm
@@ -45,4 +45,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/bwm-ng/bwm-ng.nm b/bwm-ng/bwm-ng.nm
index 738321dea..d319cc1f0 100644
--- a/bwm-ng/bwm-ng.nm
+++ b/bwm-ng/bwm-ng.nm
@@ -27,4 +27,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/bzip2/bzip2.nm b/bzip2/bzip2.nm
index 97e1972e8..39dcf1896 100644
--- a/bzip2/bzip2.nm
+++ b/bzip2/bzip2.nm
@@ -62,4 +62,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/c_icap/c_icap.nm b/c_icap/c_icap.nm
index 3fde7684f..bf873ec82 100644
--- a/c_icap/c_icap.nm
+++ b/c_icap/c_icap.nm
@@ -50,4 +50,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/c_icap_modules/c_icap_modules.nm b/c_icap_modules/c_icap_modules.nm
index 7b8cde1b8..5f34d46a6 100644
--- a/c_icap_modules/c_icap_modules.nm
+++ b/c_icap_modules/c_icap_modules.nm
@@ -48,4 +48,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/cairo/cairo.nm b/cairo/cairo.nm
index ed393a31e..5cafa622c 100644
--- a/cairo/cairo.nm
+++ b/cairo/cairo.nm
@@ -36,7 +36,7 @@ packages
 
 	package %{name}-devel
 		template DEVEL
-	
+
 		# The development package needs the other dependencies as well.
 		requires
 			fontconfig-devel
@@ -45,4 +45,8 @@ packages
 			pixman-devel
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/ccache/ccache.nm b/ccache/ccache.nm
index c9569a231..8c25d7c52 100644
--- a/ccache/ccache.nm
+++ b/ccache/ccache.nm
@@ -64,4 +64,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/chrony/chrony.nm b/chrony/chrony.nm
index c80e02884..956eead48 100644
--- a/chrony/chrony.nm
+++ b/chrony/chrony.nm
@@ -79,28 +79,32 @@ packages
 			/etc/chrony.conf
 			/etc/chrony.keys
 		end
-	
+
 		prerequires = shadow-utils systemd-units
 
 		script prein
 			%{create_user}
 		end
-	
+
 		script postin
 			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 			/bin/systemctl --no-reload enable \
 				chrony-wait.service chronyd.service >/dev/null 2>&1 || :
 		end
-	
+
 		script preun
 			/bin/systemctl --no-reload disable \
 				chrony-wait.service chronyd.service >/dev/null 2>&1 || :
 			/bin/systemctl stop chrony-wait.service chronyd.service >/dev/null 2>&1 || :
 		end
-	
+
 		script postup
 			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 			/bin/systemctl try-restart chronyd.service >/dev/null 2>&1 || :
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/chrpath/chrpath.nm b/chrpath/chrpath.nm
index c176c9cbe..610693055 100644
--- a/chrpath/chrpath.nm
+++ b/chrpath/chrpath.nm
@@ -32,4 +32,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/clamav/clamav.nm b/clamav/clamav.nm
index a3c74738b..ae809ebae 100644
--- a/clamav/clamav.nm
+++ b/clamav/clamav.nm
@@ -65,12 +65,16 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-libs
 		template LIBS
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/cloog-ppl/cloog-ppl.nm b/cloog-ppl/cloog-ppl.nm
index d188a15de..e8966bece 100644
--- a/cloog-ppl/cloog-ppl.nm
+++ b/cloog-ppl/cloog-ppl.nm
@@ -50,4 +50,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/cmake/cmake.nm b/cmake/cmake.nm
index 9cfc81917..ddbe23aa0 100644
--- a/cmake/cmake.nm
+++ b/cmake/cmake.nm
@@ -66,4 +66,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/coreutils/coreutils.nm b/coreutils/coreutils.nm
index 0f3545320..8061fd9ad 100644
--- a/coreutils/coreutils.nm
+++ b/coreutils/coreutils.nm
@@ -80,4 +80,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/cpio/cpio.nm b/cpio/cpio.nm
index 9ce15f37c..7b21d8478 100644
--- a/cpio/cpio.nm
+++ b/cpio/cpio.nm
@@ -36,4 +36,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/cpufrequtils/cpufrequtils.nm b/cpufrequtils/cpufrequtils.nm
index 169592230..6465a45b0 100644
--- a/cpufrequtils/cpufrequtils.nm
+++ b/cpufrequtils/cpufrequtils.nm
@@ -32,8 +32,12 @@ packages
 	package %{name}
 		groups += Base
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/cracklib/cracklib.nm b/cracklib/cracklib.nm
index ac714726e..f008a9ba1 100644
--- a/cracklib/cracklib.nm
+++ b/cracklib/cracklib.nm
@@ -70,27 +70,31 @@ packages
 	package %{name}
 		requires = %{name}-dicts
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
-	
+
 	# We build an extra package with the dictionaries.
 	package %{name}-dicts
 		summary = Dictionaries for %{thisapp}.
 		description = %{summary}
-	
+
 		files
 			/lib/cracklib
 			/usr/share/dict*
 		end
 	end
-	
+
 	# We build an extra python package with the bindings for it.
 	package python-cracklib
 		summary = Python bindings for ${thisapp}.
 		description = %{summary}
-	
+
 		files = /usr/lib*/python*
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/crda/crda.nm b/crda/crda.nm
index d436ca2c3..16af943de 100644
--- a/crda/crda.nm
+++ b/crda/crda.nm
@@ -42,4 +42,8 @@ packages
 			wireless-regdb
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/cronie/cronie.nm b/cronie/cronie.nm
index 614d1cb30..ae94fa5be 100644
--- a/cronie/cronie.nm
+++ b/cronie/cronie.nm
@@ -34,4 +34,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/cryptsetup-luks/cryptsetup-luks.nm b/cryptsetup-luks/cryptsetup-luks.nm
index 116aa54b6..8ac430276 100644
--- a/cryptsetup-luks/cryptsetup-luks.nm
+++ b/cryptsetup-luks/cryptsetup-luks.nm
@@ -47,8 +47,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/cups/cups.nm b/cups/cups.nm
index 3ecdae972..39225947d 100644
--- a/cups/cups.nm
+++ b/cups/cups.nm
@@ -78,14 +78,18 @@ packages
 	package %{name}
 		requires = ghostscript
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 
 		requires += %{name}-libs=%{thisver}
 	end
-	
+
 	package %{name}-libs
 		template LIBS
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/curl/curl.nm b/curl/curl.nm
index 5a752fd80..68a22bfae 100644
--- a/curl/curl.nm
+++ b/curl/curl.nm
@@ -60,12 +60,18 @@ end
 
 packages
 	package curl
-	
+
 	package libcurl
 		template LIBS
 	end
-	
+
 	package libcurl-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+
+		provides += libcurl-debuginfo
+	end
 end
diff --git a/cyrus-sasl/cyrus-sasl.nm b/cyrus-sasl/cyrus-sasl.nm
index b28d40208..4609f37be 100644
--- a/cyrus-sasl/cyrus-sasl.nm
+++ b/cyrus-sasl/cyrus-sasl.nm
@@ -50,8 +50,12 @@ packages
 	package %{name}-libs
 		template LIBS
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/dansguardian/dansguardian.nm b/dansguardian/dansguardian.nm
index 4a0833508..4ac512b77 100644
--- a/dansguardian/dansguardian.nm
+++ b/dansguardian/dansguardian.nm
@@ -46,4 +46,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/db4/db4.nm b/db4/db4.nm
index c0279ba56..4fe07f95b 100644
--- a/db4/db4.nm
+++ b/db4/db4.nm
@@ -51,14 +51,14 @@ end
 
 packages
 	package db4
-	
+
 	package db4-devel
 		template DEVEL
 
 		files += \
 			!/usr/lib*/libdb-%{version_major}.so
 	end
-	
+
 	package db4-utils
 		summary = Command line tools for managing Berkeley DB (version 4) databases.
 		description = %{summary}
@@ -67,7 +67,7 @@ packages
 			/usr/bin
 		end
 	end
-	
+
 	package db4-cxx
 		summary = The Berkeley DB database library (version 4) for C++.
 		description = %{summary}
@@ -76,4 +76,8 @@ packages
 			/usr/lib*/libdb_cxx-%{version_major}.so
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/dbus-glib/dbus-glib.nm b/dbus-glib/dbus-glib.nm
index c80decc27..8054c6d37 100644
--- a/dbus-glib/dbus-glib.nm
+++ b/dbus-glib/dbus-glib.nm
@@ -49,10 +49,14 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
-	
+
 		requires = glib2-devel
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/dbus/dbus.nm b/dbus/dbus.nm
index 93b775091..7286d068a 100644
--- a/dbus/dbus.nm
+++ b/dbus/dbus.nm
@@ -68,9 +68,9 @@ packages
 		# Just search for new unit files that were just installed.
 		script postin
 			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-		
+
 			# The dbus service should be started on default.
-			/bin/systemctl enable dbus.service > /dev/null 2>&1 || : 
+			/bin/systemctl enable dbus.service > /dev/null 2>&1 || :
 		end
 
 		# Disable the service that is to be removed and stop it if it is still running.
@@ -90,14 +90,18 @@ packages
 			/bin/systemctl try-restart dbus.service >/dev/null 2>&1 || :
 		end
 	end
-	
+
 	package %{name}-libs
 		template LIBS
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
-	
+
 		files += /usr/lib/dbus-1.0
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/dejagnu/dejagnu.nm b/dejagnu/dejagnu.nm
index 52eb826d2..2c0d195a4 100644
--- a/dejagnu/dejagnu.nm
+++ b/dejagnu/dejagnu.nm
@@ -41,7 +41,7 @@ packages
 	package %{name}
 		requires = expect tcl
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
diff --git a/dhcp/dhcp.nm b/dhcp/dhcp.nm
index 05dfd2fe2..507891a9e 100644
--- a/dhcp/dhcp.nm
+++ b/dhcp/dhcp.nm
@@ -16,7 +16,7 @@ description
 	DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
 	individual devices on an IP network to get their own network
 	configuration information (IP address, subnetmask, broadcast address,
-	etc.) from a DHCP server. The overall purpose of DHCP is to make it 
+	etc.) from a DHCP server. The overall purpose of DHCP is to make it
 	easier to administer a large network.
 end
 
@@ -189,7 +189,7 @@ packages
 	package %{name}-common
 		summary = Common files used by the dhcp client and server.
 		description = %{summary}
-		
+
 		files
 			/usr/bin/
 			/usr/share/man/man1/omshell.1*
@@ -205,4 +205,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/dhcping/dhcping.nm b/dhcping/dhcping.nm
index b43cc70ca..ef2d45c51 100644
--- a/dhcping/dhcping.nm
+++ b/dhcping/dhcping.nm
@@ -27,4 +27,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/dialog/dialog.nm b/dialog/dialog.nm
index 00fefbfc0..b46ae2bba 100644
--- a/dialog/dialog.nm
+++ b/dialog/dialog.nm
@@ -57,4 +57,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/diffutils/diffutils.nm b/diffutils/diffutils.nm
index 6d575c6cf..f7b41ecaf 100644
--- a/diffutils/diffutils.nm
+++ b/diffutils/diffutils.nm
@@ -32,4 +32,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/directfb/directfb.nm b/directfb/directfb.nm
index 5e777c445..e8d24338a 100644
--- a/directfb/directfb.nm
+++ b/directfb/directfb.nm
@@ -49,4 +49,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/dmidecode/dmidecode.nm b/dmidecode/dmidecode.nm
index 43d244a24..d42cf91eb 100644
--- a/dmidecode/dmidecode.nm
+++ b/dmidecode/dmidecode.nm
@@ -33,4 +33,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/dmraid/dmraid.nm b/dmraid/dmraid.nm
index 5b7e58b94..9a43c0b51 100644
--- a/dmraid/dmraid.nm
+++ b/dmraid/dmraid.nm
@@ -57,8 +57,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/docbook-dtds/docbook-dtds.nm b/docbook-dtds/docbook-dtds.nm
index 0adc6966c..5841054da 100644
--- a/docbook-dtds/docbook-dtds.nm
+++ b/docbook-dtds/docbook-dtds.nm
@@ -78,7 +78,7 @@ build
 		macro_extract docbook-4.4.zip 4.4-sgml
 		macro_extract docbook-xml-4.4.zip 4.4-xml
 		macro_extract docbook-4.5.zip 4.5-sgml
-		macro_extract docbook-xml-4.5.zip 4.5-xml			
+		macro_extract docbook-xml-4.5.zip 4.5-xml
 
 		# Convert all catalog files to unix format
 		cd %{DIR_APP} && dos2unix */docbook.cat
@@ -197,7 +197,7 @@ packages
 		script postun
 			# remove entries only on removal of package
 			if [ "$1" = 0 ]; then
- 
+
 				entities="
 					ent/iso-pub.ent
 					ent/iso-grk1.ent
diff --git a/docbook-utils/docbook-utils.nm b/docbook-utils/docbook-utils.nm
index 44a236c88..a0bc3f471 100644
--- a/docbook-utils/docbook-utils.nm
+++ b/docbook-utils/docbook-utils.nm
@@ -50,4 +50,8 @@ packages
 			openjade
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/dos2unix/dos2unix.nm b/dos2unix/dos2unix.nm
index 5b0b053ab..55da32154 100644
--- a/dos2unix/dos2unix.nm
+++ b/dos2unix/dos2unix.nm
@@ -37,4 +37,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/dosfstools/dosfstools.nm b/dosfstools/dosfstools.nm
index c479619f6..1ab3d5eca 100644
--- a/dosfstools/dosfstools.nm
+++ b/dosfstools/dosfstools.nm
@@ -31,4 +31,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/dracut/dracut.nm b/dracut/dracut.nm
index bedfd4e17..8b49f4d57 100644
--- a/dracut/dracut.nm
+++ b/dracut/dracut.nm
@@ -60,21 +60,21 @@ packages
 			which
 		end
 	end
-	
+
 	package %{name}-network
 		summary = Network support for the initramdisk.
 		description
 			This package requires everything which is needed to build a generic
 			all purpose initramfs with network support with dracut.
 		end
-	
+
 		requires
 			bridge-utils
 			dhclient
 			iproute2
 			nfs-utils
 		end
-	
+
 		files
 			/usr/share/dracut/modules.d/40network
 			/usr/share/dracut/modules.d/95fcoe
@@ -85,12 +85,12 @@ packages
 			/usr/share/dracut/modules.d/95znet
 		end
 	end
-	
-	
+
+
 	package %{name}-utils
 		summary = Command line utils for dracut.
 		description = %{summary}
-	
+
 		files
 			/sbin/dracut-*
 			/sbin/*initrd
diff --git a/dvdrtools/dvdrtools.nm b/dvdrtools/dvdrtools.nm
index 5efad8de7..efa34909a 100644
--- a/dvdrtools/dvdrtools.nm
+++ b/dvdrtools/dvdrtools.nm
@@ -34,4 +34,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/e2fsprogs/e2fsprogs.nm b/e2fsprogs/e2fsprogs.nm
index 7b80dcdc9..e55ee5d75 100644
--- a/e2fsprogs/e2fsprogs.nm
+++ b/e2fsprogs/e2fsprogs.nm
@@ -80,8 +80,12 @@ packages
 	package %{name}
 		groups += Base
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/ebtables/ebtables.nm b/ebtables/ebtables.nm
index 3ace47824..5235920dd 100644
--- a/ebtables/ebtables.nm
+++ b/ebtables/ebtables.nm
@@ -49,4 +49,8 @@ packages
 			libebt
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/ed/ed.nm b/ed/ed.nm
index f2ddbc78f..fe1f11583 100644
--- a/ed/ed.nm
+++ b/ed/ed.nm
@@ -39,4 +39,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/eggdbus/eggdbus.nm b/eggdbus/eggdbus.nm
index 502736d81..fe158655b 100644
--- a/eggdbus/eggdbus.nm
+++ b/eggdbus/eggdbus.nm
@@ -34,8 +34,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/eject/eject.nm b/eject/eject.nm
index e2a74888b..7f1e448bf 100644
--- a/eject/eject.nm
+++ b/eject/eject.nm
@@ -36,4 +36,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/elfutils/elfutils.nm b/elfutils/elfutils.nm
index a94a9f930..a56e6bc00 100644
--- a/elfutils/elfutils.nm
+++ b/elfutils/elfutils.nm
@@ -60,7 +60,7 @@ packages
 
 	package %{name}-devel
 		template DEVEL
-	
+
 		requires = %{name}=%{thisver} %{name}-libs=%{thisver}
 	end
 
@@ -70,4 +70,8 @@ packages
 		files += /usr/lib*/lib*%{version}.so
 		files += /usr/lib/elfutils
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/elinks/elinks.nm b/elinks/elinks.nm
index b17764b77..1e7bc5120 100644
--- a/elinks/elinks.nm
+++ b/elinks/elinks.nm
@@ -44,4 +44,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/etherwake/etherwake.nm b/etherwake/etherwake.nm
index 5ceab2aa9..57728b7c2 100644
--- a/etherwake/etherwake.nm
+++ b/etherwake/etherwake.nm
@@ -34,4 +34,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/ethtool/ethtool.nm b/ethtool/ethtool.nm
index dfbca0e61..ce61a72dd 100644
--- a/ethtool/ethtool.nm
+++ b/ethtool/ethtool.nm
@@ -28,4 +28,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/expat/expat.nm b/expat/expat.nm
index dc13fc737..d03a8bcf1 100644
--- a/expat/expat.nm
+++ b/expat/expat.nm
@@ -38,8 +38,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/expect/expect.nm b/expect/expect.nm
index eea26324a..0648f33ac 100644
--- a/expect/expect.nm
+++ b/expect/expect.nm
@@ -53,4 +53,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/ez-ipupdate/ez-ipupdate.nm b/ez-ipupdate/ez-ipupdate.nm
index a91cdc4b4..4d92b792a 100644
--- a/ez-ipupdate/ez-ipupdate.nm
+++ b/ez-ipupdate/ez-ipupdate.nm
@@ -28,4 +28,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/fail2ban/fail2ban.nm b/fail2ban/fail2ban.nm
index 0d204e028..38ad03b67 100644
--- a/fail2ban/fail2ban.nm
+++ b/fail2ban/fail2ban.nm
@@ -40,4 +40,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/file/file.nm b/file/file.nm
index fc990ef6c..fc45b81ae 100644
--- a/file/file.nm
+++ b/file/file.nm
@@ -42,4 +42,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/filesystem/filesystem.nm b/filesystem/filesystem.nm
index f5668ef54..cb010b469 100644
--- a/filesystem/filesystem.nm
+++ b/filesystem/filesystem.nm
@@ -88,8 +88,8 @@ build
 		chown root:mail %{BUILDROOT}/var/spool/mail
 		chmod 775 %{BUILDROOT}/var/spool/mail
 	end
-	
-	# XXX not implemented at the moment	
+
+	# XXX not implemented at the moment
 	export QUALITY_AGENT_NO_DIRECTORY_CHECK = yes
 	export QUALITY_AGENT_NO_DIRECTORY_PRUNE = yes
 end
@@ -98,4 +98,7 @@ packages
 	package %{name}
 		prerequires = setup
 	end
+
+	# Although this package is not noarch, it does not
+	# contain any binary data and thus has no debuginfo package.
 end
diff --git a/findutils/findutils.nm b/findutils/findutils.nm
index 335aa68c9..8e840ca8f 100644
--- a/findutils/findutils.nm
+++ b/findutils/findutils.nm
@@ -47,4 +47,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/firewall/firewall.nm b/firewall/firewall.nm
index 6e3cd35ea..53b3c8fc2 100644
--- a/firewall/firewall.nm
+++ b/firewall/firewall.nm
@@ -41,4 +41,8 @@ packages
 	package %{name}
 		requires = iproute2 iptables
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/flex/flex.nm b/flex/flex.nm
index 30df43918..2993e4fbc 100644
--- a/flex/flex.nm
+++ b/flex/flex.nm
@@ -54,8 +54,12 @@ packages
 	package %{name}
 		requires = m4
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/fontconfig/fontconfig.nm b/fontconfig/fontconfig.nm
index 666165c43..5520cbb3e 100644
--- a/fontconfig/fontconfig.nm
+++ b/fontconfig/fontconfig.nm
@@ -37,8 +37,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/freeradius/freeradius.nm b/freeradius/freeradius.nm
index 62b72897b..a9ea8beff 100644
--- a/freeradius/freeradius.nm
+++ b/freeradius/freeradius.nm
@@ -112,16 +112,16 @@ packages
 		script prein
 			%{create_user}
 		end
-	
+
 		script postin
 			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 		end
-	
+
 		script preun
 			/bin/systemctl --no-reload disable freeradius.service >/dev/null 2>&1 || :
 			/bin/systemctl stop freeradius.service >/dev/null 2>&1 || :
 		end
-	
+
 		script postup
 			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 			/bin/systemctl try-restart freeradius.service >/dev/null 2>&1 || :
@@ -152,4 +152,8 @@ packages
 			/usr/share/man/man8/rlm_ippool_tool.8
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/freetype/freetype.nm b/freetype/freetype.nm
index f8aaa8c9a..c0a2c2c0d 100644
--- a/freetype/freetype.nm
+++ b/freetype/freetype.nm
@@ -33,8 +33,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/fuse-sshfs/fuse-sshfs.nm b/fuse-sshfs/fuse-sshfs.nm
index ac137808e..fab5b72ad 100644
--- a/fuse-sshfs/fuse-sshfs.nm
+++ b/fuse-sshfs/fuse-sshfs.nm
@@ -37,4 +37,8 @@ packages
 		provides = sshfs=%{thisver}
 		requires = openssh-clients
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/fuse/fuse.nm b/fuse/fuse.nm
index e8fe47d00..4974a398c 100644
--- a/fuse/fuse.nm
+++ b/fuse/fuse.nm
@@ -43,8 +43,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/gawk/gawk.nm b/gawk/gawk.nm
index 835aef21d..d64c62062 100644
--- a/gawk/gawk.nm
+++ b/gawk/gawk.nm
@@ -51,4 +51,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/gcc/gcc.nm b/gcc/gcc.nm
index 9588701d5..8fd265ac8 100644
--- a/gcc/gcc.nm
+++ b/gcc/gcc.nm
@@ -294,4 +294,8 @@ packages
 			/usr/lib/libquadmath*.so
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/gdb/gdb.nm b/gdb/gdb.nm
index c1f72400c..8ad9a5a36 100644
--- a/gdb/gdb.nm
+++ b/gdb/gdb.nm
@@ -78,4 +78,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/gdbm/gdbm.nm b/gdbm/gdbm.nm
index 30404d391..9362e7039 100644
--- a/gdbm/gdbm.nm
+++ b/gdbm/gdbm.nm
@@ -38,8 +38,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/gdk-pixbuf2/gdk-pixbuf2.nm b/gdk-pixbuf2/gdk-pixbuf2.nm
index 35172b758..7fa3659ad 100644
--- a/gdk-pixbuf2/gdk-pixbuf2.nm
+++ b/gdk-pixbuf2/gdk-pixbuf2.nm
@@ -38,8 +38,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/gettext/gettext.nm b/gettext/gettext.nm
index 0732fdffe..2ba29cdde 100644
--- a/gettext/gettext.nm
+++ b/gettext/gettext.nm
@@ -47,7 +47,7 @@ end
 
 packages
 	package %{name}
-	
+
 	package %{name}-devel
 		template DEVEL
 
@@ -65,4 +65,8 @@ packages
 			/usr/lib/preloadable_libintl.so
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/ghostscript/ghostscript.nm b/ghostscript/ghostscript.nm
index b31090001..f58df7076 100644
--- a/ghostscript/ghostscript.nm
+++ b/ghostscript/ghostscript.nm
@@ -41,4 +41,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/git/git.nm b/git/git.nm
index 2317c878c..7501f7de4 100644
--- a/git/git.nm
+++ b/git/git.nm
@@ -27,6 +27,7 @@ build
 		gettext
 		libcurl-devel
 		openssl-devel
+		perl-ExtUtils-MakeMaker
 		perl-devel
 		zlib-devel
 	end
@@ -62,6 +63,10 @@ packages
 			rsync
 			/usr/bin/vi
 		end
-	
+
+	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
 	end
 end
diff --git a/glib2/glib2.nm b/glib2/glib2.nm
index 04efcba73..67c7fb097 100644
--- a/glib2/glib2.nm
+++ b/glib2/glib2.nm
@@ -57,4 +57,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/glibc/glibc.nm b/glibc/glibc.nm
index efd031cd8..88ceb394d 100644
--- a/glibc/glibc.nm
+++ b/glibc/glibc.nm
@@ -249,7 +249,7 @@ end
 
 packages
 	package glibc
-		requires = glibc-common=%{thisver}	
+		requires = glibc-common=%{thisver}
 	end
 
 	package glibc-common
@@ -339,4 +339,8 @@ packages
 			/usr/lib/libpcprofile.so
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/gmp/gmp.nm b/gmp/gmp.nm
index 7a5f24e06..6348b9f27 100644
--- a/gmp/gmp.nm
+++ b/gmp/gmp.nm
@@ -170,4 +170,8 @@ packages
 			/usr/lib/libgmp.so.3*
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/gnupg2/gnupg2.nm b/gnupg2/gnupg2.nm
index 662335975..d5b10b892 100644
--- a/gnupg2/gnupg2.nm
+++ b/gnupg2/gnupg2.nm
@@ -41,4 +41,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm
index b316decd8..4414df6c4 100644
--- a/gnutls/gnutls.nm
+++ b/gnutls/gnutls.nm
@@ -53,4 +53,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/gobject-introspection/gobject-introspection.nm b/gobject-introspection/gobject-introspection.nm
index fc9232eb5..9c9cd1696 100644
--- a/gobject-introspection/gobject-introspection.nm
+++ b/gobject-introspection/gobject-introspection.nm
@@ -48,10 +48,14 @@ packages
 	package %{name}-libs
 		template LIBS
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
-	
+
 		requires = %{name}=%{thisver}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/gperf/gperf.nm b/gperf/gperf.nm
index add112c0b..acdd33b99 100644
--- a/gperf/gperf.nm
+++ b/gperf/gperf.nm
@@ -32,4 +32,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/grep/grep.nm b/grep/grep.nm
index 1a1a13851..348d8a4c2 100644
--- a/grep/grep.nm
+++ b/grep/grep.nm
@@ -37,4 +37,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/groff/groff.nm b/groff/groff.nm
index 344e745bc..1a4fa8cd2 100644
--- a/groff/groff.nm
+++ b/groff/groff.nm
@@ -72,4 +72,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/grub/grub.nm b/grub/grub.nm
index 409ce33e6..6b9ab693b 100644
--- a/grub/grub.nm
+++ b/grub/grub.nm
@@ -84,4 +84,8 @@ packages
 				--range=0x0000-0x0241,0x2190-0x21FF,0x2500-0x259f /usr/share/X11/fonts/misc/unifont.pcf.gz
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/grubby/grubby.nm b/grubby/grubby.nm
index 894b5a208..92c1a5860 100644
--- a/grubby/grubby.nm
+++ b/grubby/grubby.nm
@@ -13,10 +13,10 @@ license    = GPLv2+
 summary    = Command line tool for updating bootloader configs.
 
 description
-	grubby  is  a command line tool for updating and displaying information about 
-	the configuration files for the grub, lilo, elilo (ia64), yaboot (powerpc)  
+	grubby  is  a command line tool for updating and displaying information about
+	the configuration files for the grub, lilo, elilo (ia64), yaboot (powerpc)
 	and zipl (s390) boot loaders. It is primarily designed to be used from scripts
-	which install new kernels and need to find information about the current boot 
+	which install new kernels and need to find information about the current boot
 	environment.
 end
 
@@ -39,4 +39,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/gssdp/gssdp.nm b/gssdp/gssdp.nm
index 792f8720a..6331c7c03 100644
--- a/gssdp/gssdp.nm
+++ b/gssdp/gssdp.nm
@@ -29,8 +29,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/guile/guile.nm b/guile/guile.nm
index ef8e08fe4..3c72e701b 100644
--- a/guile/guile.nm
+++ b/guile/guile.nm
@@ -50,4 +50,8 @@ packages
 
 		requires = gmp-devel libtool-devel
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/gupnp-av/gupnp-av.nm b/gupnp-av/gupnp-av.nm
index 18c8e257f..d6f391754 100644
--- a/gupnp-av/gupnp-av.nm
+++ b/gupnp-av/gupnp-av.nm
@@ -32,8 +32,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/gupnp-igd/gupnp-igd.nm b/gupnp-igd/gupnp-igd.nm
index e84c0a65d..dd0981ab8 100644
--- a/gupnp-igd/gupnp-igd.nm
+++ b/gupnp-igd/gupnp-igd.nm
@@ -32,8 +32,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/gupnp/gupnp.nm b/gupnp/gupnp.nm
index 5dd403a52..02a28ed0c 100644
--- a/gupnp/gupnp.nm
+++ b/gupnp/gupnp.nm
@@ -36,8 +36,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/gzip/gzip.nm b/gzip/gzip.nm
index b3d2baab0..ca3970b20 100644
--- a/gzip/gzip.nm
+++ b/gzip/gzip.nm
@@ -47,4 +47,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/hdparm/hdparm.nm b/hdparm/hdparm.nm
index 4ccd35f65..be51efd55 100644
--- a/hdparm/hdparm.nm
+++ b/hdparm/hdparm.nm
@@ -33,4 +33,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/help2man/help2man.nm b/help2man/help2man.nm
index 208f1ff1a..a1ded2165 100644
--- a/help2man/help2man.nm
+++ b/help2man/help2man.nm
@@ -34,4 +34,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/hostapd/hostapd.nm b/hostapd/hostapd.nm
index 960013901..507c0ea64 100644
--- a/hostapd/hostapd.nm
+++ b/hostapd/hostapd.nm
@@ -47,4 +47,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/hplip/hplip.nm b/hplip/hplip.nm
index 16eb31de4..cd3a8a2f6 100644
--- a/hplip/hplip.nm
+++ b/hplip/hplip.nm
@@ -45,4 +45,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/htop/htop.nm b/htop/htop.nm
index db39ba096..24e8590c3 100644
--- a/htop/htop.nm
+++ b/htop/htop.nm
@@ -35,4 +35,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/ibod/ibod.nm b/ibod/ibod.nm
index 84f41117d..964881b1b 100644
--- a/ibod/ibod.nm
+++ b/ibod/ibod.nm
@@ -46,7 +46,7 @@ packages
 		# There isn't any chance at the moment to determine the names of
 		# spawned instances by a systemd service file.
 		#
-		# So we aren't able to stop any ibod process before uninstalling the package. 
+		# So we aren't able to stop any ibod process before uninstalling the package.
 		script postin
 			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 		end
@@ -59,4 +59,8 @@ packages
 			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/icecream/icecream.nm b/icecream/icecream.nm
index be1ee1595..d41e4e0ec 100644
--- a/icecream/icecream.nm
+++ b/icecream/icecream.nm
@@ -112,8 +112,12 @@ packages
 				icecc-scheduler.service >/dev/null 2>&1 || :
 		end
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/iftop/iftop.nm b/iftop/iftop.nm
index bee6dac1c..b6c651fb0 100644
--- a/iftop/iftop.nm
+++ b/iftop/iftop.nm
@@ -33,4 +33,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/igmpproxy/igmpproxy.nm b/igmpproxy/igmpproxy.nm
index 41cff18ef..12e842c56 100644
--- a/igmpproxy/igmpproxy.nm
+++ b/igmpproxy/igmpproxy.nm
@@ -28,4 +28,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/initscripts/initscripts.nm b/initscripts/initscripts.nm
index 08850f82f..2dc0203e8 100644
--- a/initscripts/initscripts.nm
+++ b/initscripts/initscripts.nm
@@ -103,4 +103,8 @@ packages
 			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/iperf/iperf.nm b/iperf/iperf.nm
index 3a7937516..d7612c595 100644
--- a/iperf/iperf.nm
+++ b/iperf/iperf.nm
@@ -30,4 +30,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/iproute2/iproute2.nm b/iproute2/iproute2.nm
index 14fe817cc..226081572 100644
--- a/iproute2/iproute2.nm
+++ b/iproute2/iproute2.nm
@@ -42,4 +42,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/iptables/iptables.nm b/iptables/iptables.nm
index 771397d7a..ef8c3d04d 100644
--- a/iptables/iptables.nm
+++ b/iptables/iptables.nm
@@ -79,8 +79,12 @@ packages
 	package %{name}
 		groups += Base
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/iputils/iputils.nm b/iputils/iputils.nm
index 4616ba28e..52594aee1 100644
--- a/iputils/iputils.nm
+++ b/iputils/iputils.nm
@@ -81,4 +81,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/iscsi-initiator-utils/iscsi-initiator-utils.nm b/iscsi-initiator-utils/iscsi-initiator-utils.nm
index 01e61c8df..ac1dbd493 100644
--- a/iscsi-initiator-utils/iscsi-initiator-utils.nm
+++ b/iscsi-initiator-utils/iscsi-initiator-utils.nm
@@ -78,21 +78,25 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package libiscsi
 		template LIBS
-	
+
 		files
 			/usr/lib*/libiscsi.so.*
 		end
 	end
-	
+
 	package libiscsi-devel
 		template DEVEL
-	
+
 		files
 			/usr/lib/libiscsi.so
 			/usr/include
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/isdn4k-utils/isdn4k-utils.nm b/isdn4k-utils/isdn4k-utils.nm
index 3928e0bf7..49998d5b2 100644
--- a/isdn4k-utils/isdn4k-utils.nm
+++ b/isdn4k-utils/isdn4k-utils.nm
@@ -16,7 +16,7 @@ summary    = Utilities for configuring an ISDN subsystem.
 
 description
 	The isdn4k-utils package contains a collection of utilities needed
-	for configuring and running an ISDN subsystem. 
+	for configuring and running an ISDN subsystem.
 end
 
 source_dl  = ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/
@@ -38,7 +38,7 @@ build
 		-D_LARGEFILE_SOURCE
 
 	prepare_cmds
-		# remove useless files 
+		# remove useless files
 		find -type d -name CVS | xargs rm -rf
 
 		# enable capi20.new
@@ -61,9 +61,9 @@ build
 		echo "CONFIG_FAQ=y" >> .config
 		echo "CONFIG_FAQDIR='/usr/share/doc/isdn4k-utils'" >> .config
 		echo "CONFIG_DATADIR='/usr/share/isdn'" >> .config
-		echo "LIBDIR='/usr/lib'" >> .config 
-		echo "CONFIG_FIRMWAREDIR='/usr/share/isdn'" >> .config 
-		echo "CONFIG_CARD_SBINDIR='/sbin'" >> .config 
+		echo "LIBDIR='/usr/lib'" >> .config
+		echo "CONFIG_FIRMWAREDIR='/usr/share/isdn'" >> .config
+		echo "CONFIG_CARD_SBINDIR='/sbin'" >> .config
 		sed -e "s,',,g" .config > .config.h
 	end
 
@@ -114,4 +114,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/iw/iw.nm b/iw/iw.nm
index ff42e1453..55e5ffd76 100644
--- a/iw/iw.nm
+++ b/iw/iw.nm
@@ -36,4 +36,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/joe/joe.nm b/joe/joe.nm
index e3cc1bb6c..ecc5149f6 100644
--- a/joe/joe.nm
+++ b/joe/joe.nm
@@ -31,4 +31,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/jwhois/jwhois.nm b/jwhois/jwhois.nm
index 607a0ade2..5fcf81a3f 100644
--- a/jwhois/jwhois.nm
+++ b/jwhois/jwhois.nm
@@ -42,4 +42,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/kbd/kbd.nm b/kbd/kbd.nm
index e521a6098..2fe9da16c 100644
--- a/kbd/kbd.nm
+++ b/kbd/kbd.nm
@@ -72,4 +72,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/keepalived/keepalived.nm b/keepalived/keepalived.nm
index b05f158f6..8c825a3ad 100644
--- a/keepalived/keepalived.nm
+++ b/keepalived/keepalived.nm
@@ -72,4 +72,8 @@ packages
 			/bin/systemctl try-restart keepalived.service >/dev/null 2>&1 || :
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/ldapvi/ldapvi.nm b/ldapvi/ldapvi.nm
index 75d397c32..63c5d9e27 100644
--- a/ldapvi/ldapvi.nm
+++ b/ldapvi/ldapvi.nm
@@ -46,4 +46,8 @@ packages
 	package %{name}
 		requires = vim
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/less/less.nm b/less/less.nm
index 2e95742b7..3fa280efc 100644
--- a/less/less.nm
+++ b/less/less.nm
@@ -46,4 +46,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libICE/libICE.nm b/libICE/libICE.nm
index 8ec2d8236..6b2c67ed5 100644
--- a/libICE/libICE.nm
+++ b/libICE/libICE.nm
@@ -34,8 +34,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libSM/libSM.nm b/libSM/libSM.nm
index 7c6cc8c3e..2aae4d1f4 100644
--- a/libSM/libSM.nm
+++ b/libSM/libSM.nm
@@ -35,8 +35,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libVNCServer/libVNCServer.nm b/libVNCServer/libVNCServer.nm
index db77f0cbd..e4dfc152a 100644
--- a/libVNCServer/libVNCServer.nm
+++ b/libVNCServer/libVNCServer.nm
@@ -36,8 +36,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libX11/libX11.nm b/libX11/libX11.nm
index f705a4841..12ceb7cb2 100644
--- a/libX11/libX11.nm
+++ b/libX11/libX11.nm
@@ -32,8 +32,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libXau/libXau.nm b/libXau/libXau.nm
index d35344b12..920f8824d 100644
--- a/libXau/libXau.nm
+++ b/libXau/libXau.nm
@@ -41,8 +41,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libXaw/libXaw.nm b/libXaw/libXaw.nm
index 084330a11..0fb6d2500 100644
--- a/libXaw/libXaw.nm
+++ b/libXaw/libXaw.nm
@@ -40,8 +40,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libXdamage/libXdamage.nm b/libXdamage/libXdamage.nm
index f8c2af7f7..b1f54cc32 100644
--- a/libXdamage/libXdamage.nm
+++ b/libXdamage/libXdamage.nm
@@ -35,8 +35,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libXdmcp/libXdmcp.nm b/libXdmcp/libXdmcp.nm
index b5a5212c9..352a36e3e 100644
--- a/libXdmcp/libXdmcp.nm
+++ b/libXdmcp/libXdmcp.nm
@@ -33,8 +33,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libXext/libXext.nm b/libXext/libXext.nm
index 5c65c16b0..daa5ddc31 100644
--- a/libXext/libXext.nm
+++ b/libXext/libXext.nm
@@ -36,8 +36,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libXfixes/libXfixes.nm b/libXfixes/libXfixes.nm
index 8ceb642fc..561b92852 100644
--- a/libXfixes/libXfixes.nm
+++ b/libXfixes/libXfixes.nm
@@ -36,8 +36,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libXfont/libXfont.nm b/libXfont/libXfont.nm
index 42236acf5..27ef21611 100644
--- a/libXfont/libXfont.nm
+++ b/libXfont/libXfont.nm
@@ -37,8 +37,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libXft/libXft.nm b/libXft/libXft.nm
index 171ca074c..e1bea3b2a 100644
--- a/libXft/libXft.nm
+++ b/libXft/libXft.nm
@@ -36,8 +36,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libXi/libXi.nm b/libXi/libXi.nm
index 97dba7556..45337e415 100644
--- a/libXi/libXi.nm
+++ b/libXi/libXi.nm
@@ -36,8 +36,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libXmu/libXmu.nm b/libXmu/libXmu.nm
index 80328acbf..2c0b86c94 100644
--- a/libXmu/libXmu.nm
+++ b/libXmu/libXmu.nm
@@ -39,8 +39,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libXpm/libXpm.nm b/libXpm/libXpm.nm
index ce78a7e24..406d342b1 100644
--- a/libXpm/libXpm.nm
+++ b/libXpm/libXpm.nm
@@ -40,8 +40,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libXrandr/libXrandr.nm b/libXrandr/libXrandr.nm
index d4d9fdd24..407651561 100644
--- a/libXrandr/libXrandr.nm
+++ b/libXrandr/libXrandr.nm
@@ -36,8 +36,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libXrender/libXrender.nm b/libXrender/libXrender.nm
index b622d9a52..c9ee5b430 100644
--- a/libXrender/libXrender.nm
+++ b/libXrender/libXrender.nm
@@ -34,8 +34,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libXres/libXres.nm b/libXres/libXres.nm
index d03e476a9..d732b51db 100644
--- a/libXres/libXres.nm
+++ b/libXres/libXres.nm
@@ -38,8 +38,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libXt/libXt.nm b/libXt/libXt.nm
index 7bc1eae33..69bb3c936 100644
--- a/libXt/libXt.nm
+++ b/libXt/libXt.nm
@@ -38,8 +38,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libXtst/libXtst.nm b/libXtst/libXtst.nm
index 68b4c1090..d44de715d 100644
--- a/libXtst/libXtst.nm
+++ b/libXtst/libXtst.nm
@@ -36,8 +36,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libXv/libXv.nm b/libXv/libXv.nm
index 50fb007f0..8583fb284 100644
--- a/libXv/libXv.nm
+++ b/libXv/libXv.nm
@@ -36,8 +36,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libXvMC/libXvMC.nm b/libXvMC/libXvMC.nm
index d552db0f9..7fbd0be66 100644
--- a/libXvMC/libXvMC.nm
+++ b/libXvMC/libXvMC.nm
@@ -36,8 +36,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libXxf86vm/libXxf86vm.nm b/libXxf86vm/libXxf86vm.nm
index b850e10e7..5e7ad7e66 100644
--- a/libXxf86vm/libXxf86vm.nm
+++ b/libXxf86vm/libXxf86vm.nm
@@ -35,8 +35,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libaal/libaal.nm b/libaal/libaal.nm
index e54901529..228780787 100644
--- a/libaal/libaal.nm
+++ b/libaal/libaal.nm
@@ -38,8 +38,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libaio/libaio.nm b/libaio/libaio.nm
index 9ea613770..30208d81b 100644
--- a/libaio/libaio.nm
+++ b/libaio/libaio.nm
@@ -44,8 +44,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libarchive/libarchive.nm b/libarchive/libarchive.nm
index 1bd86320f..ea3061568 100644
--- a/libarchive/libarchive.nm
+++ b/libarchive/libarchive.nm
@@ -47,8 +47,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libart/libart.nm b/libart/libart.nm
index ced0ca9dc..ec47dfdb9 100644
--- a/libart/libart.nm
+++ b/libart/libart.nm
@@ -23,8 +23,12 @@ sources    = %{thisapp}.tar.bz2
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libassuan/libassuan.nm b/libassuan/libassuan.nm
index d120ce01c..7bce1b344 100644
--- a/libassuan/libassuan.nm
+++ b/libassuan/libassuan.nm
@@ -41,8 +41,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libatasmart/libatasmart.nm b/libatasmart/libatasmart.nm
index 6bbf1157e..78c510ee9 100644
--- a/libatasmart/libatasmart.nm
+++ b/libatasmart/libatasmart.nm
@@ -41,8 +41,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libcap-ng/libcap-ng.nm b/libcap-ng/libcap-ng.nm
index 057bae622..fae925bb5 100644
--- a/libcap-ng/libcap-ng.nm
+++ b/libcap-ng/libcap-ng.nm
@@ -43,8 +43,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libcap/libcap.nm b/libcap/libcap.nm
index 592984368..a094f1e06 100644
--- a/libcap/libcap.nm
+++ b/libcap/libcap.nm
@@ -49,4 +49,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libcgroup/libcgroup.nm b/libcgroup/libcgroup.nm
index 893b5551e..33a01f3d9 100644
--- a/libcgroup/libcgroup.nm
+++ b/libcgroup/libcgroup.nm
@@ -50,8 +50,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libcroco/libcroco.nm b/libcroco/libcroco.nm
index 4b775ba6a..8b5cb5d3b 100644
--- a/libcroco/libcroco.nm
+++ b/libcroco/libcroco.nm
@@ -9,7 +9,7 @@ major_ver  = 0.6
 release    = 1
 
 groups     = System/Libraries
-url        = 
+url        =
 license    = LGPLv2+
 summary    = A CSS2 parsing library.
 
@@ -34,8 +34,12 @@ end
 
 packages
 	package %{name}
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libdaemon/libdaemon.nm b/libdaemon/libdaemon.nm
index 6a1514964..84ebf82e5 100644
--- a/libdaemon/libdaemon.nm
+++ b/libdaemon/libdaemon.nm
@@ -27,8 +27,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libdnet/libdnet.nm b/libdnet/libdnet.nm
index e77066990..65036b393 100644
--- a/libdnet/libdnet.nm
+++ b/libdnet/libdnet.nm
@@ -37,8 +37,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libdrm/libdrm.nm b/libdrm/libdrm.nm
index 40efa2a17..007090ad5 100644
--- a/libdrm/libdrm.nm
+++ b/libdrm/libdrm.nm
@@ -51,8 +51,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libedit/libedit.nm b/libedit/libedit.nm
index 4cd530548..a481edec5 100644
--- a/libedit/libedit.nm
+++ b/libedit/libedit.nm
@@ -40,10 +40,14 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
-	
+
 		requires = ncurses-devel
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libevent/libevent.nm b/libevent/libevent.nm
index b0d4f12cd..4add6aac9 100644
--- a/libevent/libevent.nm
+++ b/libevent/libevent.nm
@@ -35,8 +35,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libffi/libffi.nm b/libffi/libffi.nm
index ea4cafd3e..284af95b6 100644
--- a/libffi/libffi.nm
+++ b/libffi/libffi.nm
@@ -23,10 +23,14 @@ source_dl  =
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
-	
+
 		files += /usr/lib*/libffi-%{version}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libfontenc/libfontenc.nm b/libfontenc/libfontenc.nm
index 679bb90fe..5009601d2 100644
--- a/libfontenc/libfontenc.nm
+++ b/libfontenc/libfontenc.nm
@@ -33,8 +33,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libgcrypt/libgcrypt.nm b/libgcrypt/libgcrypt.nm
index 708cfd16b..9fd115957 100644
--- a/libgcrypt/libgcrypt.nm
+++ b/libgcrypt/libgcrypt.nm
@@ -41,10 +41,14 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
-	
+
 		requires = libgpg-error-devel
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libgpg-error/libgpg-error.nm b/libgpg-error/libgpg-error.nm
index 637b9c279..9e5925206 100644
--- a/libgpg-error/libgpg-error.nm
+++ b/libgpg-error/libgpg-error.nm
@@ -39,8 +39,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libgssglue/libgssglue.nm b/libgssglue/libgssglue.nm
index 24ce555c3..90a197acb 100644
--- a/libgssglue/libgssglue.nm
+++ b/libgssglue/libgssglue.nm
@@ -23,8 +23,12 @@ source_dl  =
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libidn/libidn.nm b/libidn/libidn.nm
index 35109f7ec..7de885f7c 100644
--- a/libidn/libidn.nm
+++ b/libidn/libidn.nm
@@ -44,8 +44,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libjpeg/libjpeg.nm b/libjpeg/libjpeg.nm
index ff129c4be..b9d9903b8 100644
--- a/libjpeg/libjpeg.nm
+++ b/libjpeg/libjpeg.nm
@@ -51,8 +51,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libksba/libksba.nm b/libksba/libksba.nm
index 63ecf9305..d5ce0716a 100644
--- a/libksba/libksba.nm
+++ b/libksba/libksba.nm
@@ -29,8 +29,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libmng/libmng.nm b/libmng/libmng.nm
index e4819aa69..5b0ba8e8d 100644
--- a/libmng/libmng.nm
+++ b/libmng/libmng.nm
@@ -44,8 +44,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libmpc/libmpc.nm b/libmpc/libmpc.nm
index 5c351bd58..9f519696d 100644
--- a/libmpc/libmpc.nm
+++ b/libmpc/libmpc.nm
@@ -42,4 +42,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libnet/libnet.nm b/libnet/libnet.nm
index fa368c4a1..01c84dce1 100644
--- a/libnet/libnet.nm
+++ b/libnet/libnet.nm
@@ -26,8 +26,12 @@ source_dl  =
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libnetfilter_conntrack/libnetfilter_conntrack.nm b/libnetfilter_conntrack/libnetfilter_conntrack.nm
index 40a8b9bff..b2e3ee20e 100644
--- a/libnetfilter_conntrack/libnetfilter_conntrack.nm
+++ b/libnetfilter_conntrack/libnetfilter_conntrack.nm
@@ -31,8 +31,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libnetfilter_log/libnetfilter_log.nm b/libnetfilter_log/libnetfilter_log.nm
index ad6bd9218..988f45049 100644
--- a/libnetfilter_log/libnetfilter_log.nm
+++ b/libnetfilter_log/libnetfilter_log.nm
@@ -32,8 +32,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libnetfilter_queue/libnetfilter_queue.nm b/libnetfilter_queue/libnetfilter_queue.nm
index ee20f9b6c..50e609741 100644
--- a/libnetfilter_queue/libnetfilter_queue.nm
+++ b/libnetfilter_queue/libnetfilter_queue.nm
@@ -32,8 +32,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libnfnetlink/libnfnetlink.nm b/libnfnetlink/libnfnetlink.nm
index 70756bc54..411a22ddb 100644
--- a/libnfnetlink/libnfnetlink.nm
+++ b/libnfnetlink/libnfnetlink.nm
@@ -26,8 +26,12 @@ sources    = %{thisapp}.tar.bz2
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libnfsidmap/libnfsidmap.nm b/libnfsidmap/libnfsidmap.nm
index eb7894d46..f4ee0e184 100644
--- a/libnfsidmap/libnfsidmap.nm
+++ b/libnfsidmap/libnfsidmap.nm
@@ -48,8 +48,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libnl/libnl.nm b/libnl/libnl.nm
index a8d3cae4f..6e642e4d1 100644
--- a/libnl/libnl.nm
+++ b/libnl/libnl.nm
@@ -35,8 +35,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libpcap/libpcap.nm b/libpcap/libpcap.nm
index 372b1ed00..fbb8d259b 100644
--- a/libpcap/libpcap.nm
+++ b/libpcap/libpcap.nm
@@ -40,8 +40,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libpciaccess/libpciaccess.nm b/libpciaccess/libpciaccess.nm
index 4a4b1ca3e..1caed55bc 100644
--- a/libpciaccess/libpciaccess.nm
+++ b/libpciaccess/libpciaccess.nm
@@ -29,8 +29,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libpipeline/libpipeline.nm b/libpipeline/libpipeline.nm
index 3213e6873..c53645261 100644
--- a/libpipeline/libpipeline.nm
+++ b/libpipeline/libpipeline.nm
@@ -22,8 +22,12 @@ source_dl  =
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libpng/libpng.nm b/libpng/libpng.nm
index 31fdf8408..3841816e5 100644
--- a/libpng/libpng.nm
+++ b/libpng/libpng.nm
@@ -35,7 +35,11 @@ packages
 
 	package %{name}-devel
 		template DEVEL
-	
+
 		requires = zlib-devel
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/librpcsecgss/librpcsecgss.nm b/librpcsecgss/librpcsecgss.nm
index 5c2d073cc..6d6283ac0 100644
--- a/librpcsecgss/librpcsecgss.nm
+++ b/librpcsecgss/librpcsecgss.nm
@@ -29,8 +29,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/librsvg2/librsvg2.nm b/librsvg2/librsvg2.nm
index 92f6ea52d..42d4129dc 100644
--- a/librsvg2/librsvg2.nm
+++ b/librsvg2/librsvg2.nm
@@ -9,7 +9,7 @@ major_ver  = 2.34
 release    = 1
 
 groups     = System/Libraries
-url        = 
+url        =
 license    = LGPLv2+
 summary    = A SVG library based on cairo.
 
@@ -39,8 +39,12 @@ end
 
 packages
 	package %{name}
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libselinux/libselinux.nm b/libselinux/libselinux.nm
index ebffd37b2..6e4811421 100644
--- a/libselinux/libselinux.nm
+++ b/libselinux/libselinux.nm
@@ -64,11 +64,11 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
-	
+
 	package %{name}-utils
 		summary = SELinux libselinux utitlities.
 		description
@@ -80,7 +80,7 @@ packages
 			/usr/share/man/man{5,8}/*
 		end
 	end
-	
+
 	#package python-selinux
 	#	summary =  SELinux python bindings.
 	#	description = SELinux python bindings for libselinux.
@@ -89,6 +89,10 @@ packages
 	#		/usr/lib/python*
 	#	end
 	#end
-	
-	
+
+
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libsemanage/libsemanage.nm b/libsemanage/libsemanage.nm
index f5435954f..348f33514 100644
--- a/libsemanage/libsemanage.nm
+++ b/libsemanage/libsemanage.nm
@@ -50,17 +50,21 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
-	
+
 	package python-selinux-manage
 		summary =  SELinux manage python bindings.
 		description = SELinux python bindings for libsemanage.
-	
+
 		files
 			/usr/lib/python*
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libsepol/libsepol.nm b/libsepol/libsepol.nm
index dbecc79f4..ee6efd13c 100644
--- a/libsepol/libsepol.nm
+++ b/libsepol/libsepol.nm
@@ -38,8 +38,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libsigc++/libsigc++.nm b/libsigc++/libsigc++.nm
index e672087e8..eab0251ce 100644
--- a/libsigc++/libsigc++.nm
+++ b/libsigc++/libsigc++.nm
@@ -32,8 +32,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libsolv/libsolv.nm b/libsolv/libsolv.nm
index 22455af86..aade3f94b 100644
--- a/libsolv/libsolv.nm
+++ b/libsolv/libsolv.nm
@@ -67,8 +67,12 @@ end
 
 packages
 	package %{name}
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libsoup/libsoup.nm b/libsoup/libsoup.nm
index f91b31d30..868ced3c9 100644
--- a/libsoup/libsoup.nm
+++ b/libsoup/libsoup.nm
@@ -38,10 +38,14 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
-	
+
 		requires = libxml2-devel
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libssh2/libssh2.nm b/libssh2/libssh2.nm
index 351fcd5f1..16312fc5f 100644
--- a/libssh2/libssh2.nm
+++ b/libssh2/libssh2.nm
@@ -39,8 +39,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libtasn1/libtasn1.nm b/libtasn1/libtasn1.nm
index 8ffb47b68..b130a599c 100644
--- a/libtasn1/libtasn1.nm
+++ b/libtasn1/libtasn1.nm
@@ -28,8 +28,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libtiff/libtiff.nm b/libtiff/libtiff.nm
index 876d121e1..3aa99314e 100644
--- a/libtiff/libtiff.nm
+++ b/libtiff/libtiff.nm
@@ -38,8 +38,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libtool/libtool.nm b/libtool/libtool.nm
index a8c6c1365..cd72e6dc6 100644
--- a/libtool/libtool.nm
+++ b/libtool/libtool.nm
@@ -34,4 +34,8 @@ packages
 		# /usr/share/aclocal must be in main package.
 		files += !/usr/share/aclocal
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libtorrent/libtorrent.nm b/libtorrent/libtorrent.nm
index b989dabdb..9cbeb8c15 100644
--- a/libtorrent/libtorrent.nm
+++ b/libtorrent/libtorrent.nm
@@ -30,8 +30,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libusb-compat/libusb-compat.nm b/libusb-compat/libusb-compat.nm
index 909c6d7fc..bd36891d2 100644
--- a/libusb-compat/libusb-compat.nm
+++ b/libusb-compat/libusb-compat.nm
@@ -44,8 +44,12 @@ end
 packages
 	package %{name}-compat
 	end
-	
+
 	package %{name}-compat-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libusb/libusb.nm b/libusb/libusb.nm
index 6bbf64b11..5be775879 100644
--- a/libusb/libusb.nm
+++ b/libusb/libusb.nm
@@ -27,8 +27,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libuser/libuser.nm b/libuser/libuser.nm
index 12db98425..cc2e961ed 100644
--- a/libuser/libuser.nm
+++ b/libuser/libuser.nm
@@ -47,8 +47,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libvirt/libvirt.nm b/libvirt/libvirt.nm
index 90d50a645..a09438820 100644
--- a/libvirt/libvirt.nm
+++ b/libvirt/libvirt.nm
@@ -76,8 +76,12 @@ packages
 			/bin/umount
 		end
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libxcb/libxcb.nm b/libxcb/libxcb.nm
index a96db904f..c5713b0cd 100644
--- a/libxcb/libxcb.nm
+++ b/libxcb/libxcb.nm
@@ -46,10 +46,14 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
-	
+
 		requires = libXau-devel
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libxkbfile/libxkbfile.nm b/libxkbfile/libxkbfile.nm
index 6fa7cf41b..6084282b1 100644
--- a/libxkbfile/libxkbfile.nm
+++ b/libxkbfile/libxkbfile.nm
@@ -38,8 +38,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libxml2/libxml2.nm b/libxml2/libxml2.nm
index 322e60b52..3d6bb8ecf 100644
--- a/libxml2/libxml2.nm
+++ b/libxml2/libxml2.nm
@@ -36,8 +36,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libxslt/libxslt.nm b/libxslt/libxslt.nm
index 8a12e806a..5566cfed3 100644
--- a/libxslt/libxslt.nm
+++ b/libxslt/libxslt.nm
@@ -33,8 +33,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/libyaml/libyaml.nm b/libyaml/libyaml.nm
index 420920d64..f945f2388 100644
--- a/libyaml/libyaml.nm
+++ b/libyaml/libyaml.nm
@@ -32,8 +32,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/lighttpd/lighttpd.nm b/lighttpd/lighttpd.nm
index 1fb927d37..ade0c4717 100644
--- a/lighttpd/lighttpd.nm
+++ b/lighttpd/lighttpd.nm
@@ -72,25 +72,29 @@ packages
 		configfiles
 			/etc/lighttpd.conf
 		end
-	
+
 		prerequires = shadow-utils systemd-units
 
 		script prein
 			%{create_user}
 		end
-	
+
 		script postin
 			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 		end
-	
+
 		script preun
 			/bin/systemctl --no-reload disable lighttpd.service >/dev/null 2>&1 || :
 			/bin/systemctl stop lighttpd.service >/dev/null 2>&1 || :
 		end
-	
+
 		script postup
 			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 			/bin/systemctl try-restart lighttpd.service >/dev/null 2>&1 || :
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/linux-atm/linux-atm.nm b/linux-atm/linux-atm.nm
index 9970c2953..428e21fca 100644
--- a/linux-atm/linux-atm.nm
+++ b/linux-atm/linux-atm.nm
@@ -44,8 +44,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/linux-firmware/linux-firmware.nm b/linux-firmware/linux-firmware.nm
index f83462e87..d1ac240be 100644
--- a/linux-firmware/linux-firmware.nm
+++ b/linux-firmware/linux-firmware.nm
@@ -36,4 +36,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/lldpd/lldpd.nm b/lldpd/lldpd.nm
index 3521db8ee..7cce8779e 100644
--- a/lldpd/lldpd.nm
+++ b/lldpd/lldpd.nm
@@ -75,4 +75,8 @@ packages
 			/bin/systemctl try-restart lldpd.service >/dev/null 2>&1 || :
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/lm-sensors/lm-sensors.nm b/lm-sensors/lm-sensors.nm
index f68665384..20114cab3 100644
--- a/lm-sensors/lm-sensors.nm
+++ b/lm-sensors/lm-sensors.nm
@@ -42,4 +42,8 @@ packages
 	package %{name}
 		requires = perl rrdtool
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/logrotate/logrotate.nm b/logrotate/logrotate.nm
index 9b083c9ae..cdafc91e5 100644
--- a/logrotate/logrotate.nm
+++ b/logrotate/logrotate.nm
@@ -54,4 +54,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/lsof/lsof.nm b/lsof/lsof.nm
index 527e45aa4..d28871ac0 100644
--- a/lsof/lsof.nm
+++ b/lsof/lsof.nm
@@ -46,4 +46,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/lua/lua.nm b/lua/lua.nm
index b27d23848..a08ea6357 100644
--- a/lua/lua.nm
+++ b/lua/lua.nm
@@ -58,14 +58,18 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
-	
+
 	package %{name}-libs
 		template LIBS
-	
+
 		files += /usr/lib*/liblua-5.1.so
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/lvm2/lvm2.nm b/lvm2/lvm2.nm
index 0612e0232..5c033c0f3 100644
--- a/lvm2/lvm2.nm
+++ b/lvm2/lvm2.nm
@@ -52,12 +52,16 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package libdevmapper
 		template LIBS
 	end
-	
+
 	package libdevmapper-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/lzo/lzo.nm b/lzo/lzo.nm
index 917afd02d..71696afd7 100644
--- a/lzo/lzo.nm
+++ b/lzo/lzo.nm
@@ -38,4 +38,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/m4/m4.nm b/m4/m4.nm
index cd2c64df9..d49cb96b0 100644
--- a/m4/m4.nm
+++ b/m4/m4.nm
@@ -32,4 +32,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/make/make.nm b/make/make.nm
index da9192a43..c8eac07e1 100644
--- a/make/make.nm
+++ b/make/make.nm
@@ -37,4 +37,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/man-db/man-db.nm b/man-db/man-db.nm
index 2d6ad4cc4..05b9e66ec 100644
--- a/man-db/man-db.nm
+++ b/man-db/man-db.nm
@@ -66,4 +66,8 @@ packages
 			man
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/mc/mc.nm b/mc/mc.nm
index 975c501f8..587eb115c 100644
--- a/mc/mc.nm
+++ b/mc/mc.nm
@@ -13,7 +13,7 @@ license    = GPLv2+
 summary    = User-friendly text console file manager and visual shell.
 
 description
-	Midnight Commander is a visual shell much like a file manager, only 
+	Midnight Commander is a visual shell much like a file manager, only
 	with many more features. It is a text mode application, but it also
 	includes mouse support. Midnight Commander's best features are its
 	ability to FTP, view tar and zip files, and to poke into RPMs for
@@ -53,4 +53,8 @@ packages
 			perl\(pieces\)
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/mdadm/mdadm.nm b/mdadm/mdadm.nm
index 165ee4050..8e0073e46 100644
--- a/mdadm/mdadm.nm
+++ b/mdadm/mdadm.nm
@@ -48,8 +48,12 @@ end
 
 packages
 	package %{name}
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/memtest86+/memtest86+.nm b/memtest86+/memtest86+.nm
index dd024d324..8664482c7 100644
--- a/memtest86+/memtest86+.nm
+++ b/memtest86+/memtest86+.nm
@@ -40,4 +40,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/mesa/mesa.nm b/mesa/mesa.nm
index aa7c73ef9..31dafc6be 100644
--- a/mesa/mesa.nm
+++ b/mesa/mesa.nm
@@ -69,4 +69,8 @@ packages
 			libX11-devel
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/minicom/minicom.nm b/minicom/minicom.nm
index 3ab786746..a8add8b6d 100644
--- a/minicom/minicom.nm
+++ b/minicom/minicom.nm
@@ -33,4 +33,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/module-init-tools/module-init-tools.nm b/module-init-tools/module-init-tools.nm
index 06d8f6e0d..af61c1ba6 100644
--- a/module-init-tools/module-init-tools.nm
+++ b/module-init-tools/module-init-tools.nm
@@ -45,4 +45,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/mpfr/mpfr.nm b/mpfr/mpfr.nm
index 87d4dbe63..848d0379b 100644
--- a/mpfr/mpfr.nm
+++ b/mpfr/mpfr.nm
@@ -43,7 +43,7 @@ end
 
 packages
 	package %{name}
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
@@ -57,4 +57,8 @@ packages
 			/usr/lib/libmpfr.so.1*
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/mstpd/mstpd.nm b/mstpd/mstpd.nm
index 11698f360..8eb7c803b 100644
--- a/mstpd/mstpd.nm
+++ b/mstpd/mstpd.nm
@@ -54,4 +54,8 @@ packages
 			/bin/systemctl try-restart mstpd.service >/dev/null 2>&1 || :
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/multipath-tools/multipath-tools.nm b/multipath-tools/multipath-tools.nm
index ec7b49954..57c01031c 100644
--- a/multipath-tools/multipath-tools.nm
+++ b/multipath-tools/multipath-tools.nm
@@ -38,8 +38,12 @@ end
 
 packages
 	package %{name}
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/nano/nano.nm b/nano/nano.nm
index 7e88a8c03..8a69aad69 100644
--- a/nano/nano.nm
+++ b/nano/nano.nm
@@ -38,4 +38,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/nasm/nasm.nm b/nasm/nasm.nm
index 8fc7336d1..9244b0a9f 100644
--- a/nasm/nasm.nm
+++ b/nasm/nasm.nm
@@ -31,4 +31,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/ncurses/ncurses.nm b/ncurses/ncurses.nm
index 3707d4a4b..7edeba2aa 100644
--- a/ncurses/ncurses.nm
+++ b/ncurses/ncurses.nm
@@ -121,15 +121,15 @@ end
 
 packages
 	package %{name}
-	
+
 	package %{name}-libs
 		template LIBS
-	
+
 		requires
 			%{name}-base=%{thisver}
 		end
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
@@ -193,4 +193,8 @@ packages
 			/usr/share/terminfo/*/xterm xterm-*
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/net-snmp/net-snmp.nm b/net-snmp/net-snmp.nm
index 351662a08..863fedbd4 100644
--- a/net-snmp/net-snmp.nm
+++ b/net-snmp/net-snmp.nm
@@ -62,4 +62,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/net-tools/net-tools.nm b/net-tools/net-tools.nm
index 46bf2f0f2..084d5d864 100644
--- a/net-tools/net-tools.nm
+++ b/net-tools/net-tools.nm
@@ -152,4 +152,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/netplug/netplug.nm b/netplug/netplug.nm
index 302cf70a0..8c76e0a13 100644
--- a/netplug/netplug.nm
+++ b/netplug/netplug.nm
@@ -40,4 +40,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/nettle/nettle.nm b/nettle/nettle.nm
index b34378c04..af0a929e4 100644
--- a/nettle/nettle.nm
+++ b/nettle/nettle.nm
@@ -44,4 +44,8 @@ packages
 
 		requires += gmp-devel
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/newt/newt.nm b/newt/newt.nm
index 5632b2f6f..e1092b711 100644
--- a/newt/newt.nm
+++ b/newt/newt.nm
@@ -65,4 +65,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/nfs-utils/nfs-utils.nm b/nfs-utils/nfs-utils.nm
index dbf24b72b..e75e28a10 100644
--- a/nfs-utils/nfs-utils.nm
+++ b/nfs-utils/nfs-utils.nm
@@ -54,4 +54,8 @@ packages
 			util-linux
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/nmap/nmap.nm b/nmap/nmap.nm
index a439ed18c..4df52f751 100644
--- a/nmap/nmap.nm
+++ b/nmap/nmap.nm
@@ -40,4 +40,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/noip/noip.nm b/noip/noip.nm
index 16eaab2ae..ff2327912 100644
--- a/noip/noip.nm
+++ b/noip/noip.nm
@@ -34,4 +34,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/nspr/nspr.nm b/nspr/nspr.nm
index 8e84280cc..15a533aec 100644
--- a/nspr/nspr.nm
+++ b/nspr/nspr.nm
@@ -95,4 +95,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/nss-myhostname/nss-myhostname.nm b/nss-myhostname/nss-myhostname.nm
index 9573d49b6..52d64ce13 100644
--- a/nss-myhostname/nss-myhostname.nm
+++ b/nss-myhostname/nss-myhostname.nm
@@ -45,4 +45,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/nss-softokn/nss-softokn.nm b/nss-softokn/nss-softokn.nm
index 2dc0cddd8..fae15df8b 100644
--- a/nss-softokn/nss-softokn.nm
+++ b/nss-softokn/nss-softokn.nm
@@ -123,4 +123,8 @@ packages
 			/usr/lib/pkgconfig
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/nss-util/nss-util.nm b/nss-util/nss-util.nm
index 3ae22ba96..00eb9cecb 100644
--- a/nss-util/nss-util.nm
+++ b/nss-util/nss-util.nm
@@ -101,4 +101,8 @@ packages
 			/usr/lib/pkgconfig
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/nss/nss.nm b/nss/nss.nm
index 8ccc9b6a1..584e28ef0 100644
--- a/nss/nss.nm
+++ b/nss/nss.nm
@@ -63,7 +63,7 @@ build
 
 		# Extract tarball into nss directory.
 		cd %{DIR_APP} && %{MACRO_EXTRACT} %{DIR_DL}/%{name}-pem-20100809.tar.bz2
-		
+
 		# Apply all patches
 		%{MACRO_PATCHES}
 
@@ -234,4 +234,8 @@ packages
 			/usr/lib/pkgconfig
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/nss_ldap/nss_ldap.nm b/nss_ldap/nss_ldap.nm
index b5293ab93..d5358cac1 100644
--- a/nss_ldap/nss_ldap.nm
+++ b/nss_ldap/nss_ldap.nm
@@ -95,4 +95,8 @@ packages
 			/lib/security/pam_ldap.so
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/open-vm-tools/open-vm-tools.nm b/open-vm-tools/open-vm-tools.nm
index 80e56ee76..cc483b24f 100644
--- a/open-vm-tools/open-vm-tools.nm
+++ b/open-vm-tools/open-vm-tools.nm
@@ -49,4 +49,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/openjade/openjade.nm b/openjade/openjade.nm
index fe2ca1a87..7fe8c7f07 100644
--- a/openjade/openjade.nm
+++ b/openjade/openjade.nm
@@ -63,7 +63,7 @@ packages
 		prerequires +=\
 			docbook-dtds>=1.0-3 \
 			libxml2 \
-			sgml-common 
+			sgml-common
 
 		script postin
 			# Install catalog files on system.
@@ -93,4 +93,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/openl2tp/openl2tp.nm b/openl2tp/openl2tp.nm
index 38ce8eaf3..240034932 100644
--- a/openl2tp/openl2tp.nm
+++ b/openl2tp/openl2tp.nm
@@ -56,4 +56,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/openldap/openldap.nm b/openldap/openldap.nm
index 028ca96e2..fa98c0f93 100644
--- a/openldap/openldap.nm
+++ b/openldap/openldap.nm
@@ -93,4 +93,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/opensp/opensp.nm b/opensp/opensp.nm
index 4dabe2fd9..39b15925a 100644
--- a/opensp/opensp.nm
+++ b/opensp/opensp.nm
@@ -60,4 +60,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/openssh/openssh.nm b/openssh/openssh.nm
index 59bdc3cc9..199ed101c 100644
--- a/openssh/openssh.nm
+++ b/openssh/openssh.nm
@@ -96,11 +96,11 @@ packages
 			openssh-server=%{thisver}
 		end
 	end
-	
+
 	package openssh-clients
 		summary = OpenSSH client applications.
 		description = %{summary}
-	
+
 		files
 			/etc/ssh/ssh_config
 			/usr/bin/scp
@@ -126,14 +126,14 @@ packages
 			/etc/ssh/ssh_config
 		end
 	end
-	
+
 	package openssh-server
 		summary = OpenSSH server applications.
 		description = %{summary}
-	
+
 		# /usr/bin/ssh-keygen is needed to generate keys for the ssh server.
 		requires = /usr/bin/ssh-keygen
-	
+
 		files
 			/etc/pam.d/sshd
 			/etc/ssh/moduli
@@ -179,4 +179,8 @@ packages
 			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/openssl/openssl.nm b/openssl/openssl.nm
index b0a6535f3..39b731acb 100644
--- a/openssl/openssl.nm
+++ b/openssl/openssl.nm
@@ -127,4 +127,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/openvpn/openvpn.nm b/openvpn/openvpn.nm
index e126448e1..3d4bbe298 100644
--- a/openvpn/openvpn.nm
+++ b/openvpn/openvpn.nm
@@ -57,4 +57,8 @@ packages
 			iproute2
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/os-prober/os-prober.nm b/os-prober/os-prober.nm
index 25b013c0e..bef5b6475 100644
--- a/os-prober/os-prober.nm
+++ b/os-prober/os-prober.nm
@@ -48,4 +48,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/p11-kit/p11-kit.nm b/p11-kit/p11-kit.nm
index a805983aa..62802011a 100644
--- a/p11-kit/p11-kit.nm
+++ b/p11-kit/p11-kit.nm
@@ -33,4 +33,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index bddccde11..a39c50578 100644
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -98,4 +98,8 @@ packages
 
 		requires = binutils file grep
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/pam/pam.nm b/pam/pam.nm
index 277c33e63..99f82072f 100644
--- a/pam/pam.nm
+++ b/pam/pam.nm
@@ -70,4 +70,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/pam_ldap/pam_ldap.nm b/pam_ldap/pam_ldap.nm
index f7ae56514..fce21971c 100644
--- a/pam_ldap/pam_ldap.nm
+++ b/pam_ldap/pam_ldap.nm
@@ -82,4 +82,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/pango/pango.nm b/pango/pango.nm
index 71c99eb37..b544a9a76 100644
--- a/pango/pango.nm
+++ b/pango/pango.nm
@@ -40,12 +40,16 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
-	
+
 		requires
 			glib2-devel
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/parted/parted.nm b/parted/parted.nm
index d419fc9d0..dda6e6104 100644
--- a/parted/parted.nm
+++ b/parted/parted.nm
@@ -48,8 +48,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/passwd/passwd.nm b/passwd/passwd.nm
index 5d2e2ebda..13061a9e5 100644
--- a/passwd/passwd.nm
+++ b/passwd/passwd.nm
@@ -43,4 +43,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/patch/patch.nm b/patch/patch.nm
index 642be7d24..c79094fe4 100644
--- a/patch/patch.nm
+++ b/patch/patch.nm
@@ -42,4 +42,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/pax-utils/pax-utils.nm b/pax-utils/pax-utils.nm
index 4f9debb41..dca2b2cd0 100644
--- a/pax-utils/pax-utils.nm
+++ b/pax-utils/pax-utils.nm
@@ -31,4 +31,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/paxctl/paxctl.nm b/paxctl/paxctl.nm
index ed11ec4af..978360500 100644
--- a/paxctl/paxctl.nm
+++ b/paxctl/paxctl.nm
@@ -31,4 +31,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/paxtest/paxtest.nm b/paxtest/paxtest.nm
index f99c40d96..662e49b37 100644
--- a/paxtest/paxtest.nm
+++ b/paxtest/paxtest.nm
@@ -45,4 +45,8 @@ packages
 			shlibtest
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/pcapy/pcapy.nm b/pcapy/pcapy.nm
index 16b72f3aa..c12b51f34 100644
--- a/pcapy/pcapy.nm
+++ b/pcapy/pcapy.nm
@@ -40,4 +40,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/pciutils/pciutils.nm b/pciutils/pciutils.nm
index 360119b0c..396289214 100644
--- a/pciutils/pciutils.nm
+++ b/pciutils/pciutils.nm
@@ -42,12 +42,16 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-libs
 		template LIBS
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/pcre/pcre.nm b/pcre/pcre.nm
index 64e4a4bfb..5dd980fbb 100644
--- a/pcre/pcre.nm
+++ b/pcre/pcre.nm
@@ -50,4 +50,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/pdns-recursor/pdns-recursor.nm b/pdns-recursor/pdns-recursor.nm
index bc0b950a3..dc91a5c96 100644
--- a/pdns-recursor/pdns-recursor.nm
+++ b/pdns-recursor/pdns-recursor.nm
@@ -97,4 +97,8 @@ packages
 			/bin/systemctl try-restart pdns-recursor.service >/dev/null 2>&1 || :
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/pdns/pdns.nm b/pdns/pdns.nm
index 39d3edc82..0d0737c0a 100644
--- a/pdns/pdns.nm
+++ b/pdns/pdns.nm
@@ -57,4 +57,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/perl-HTML-Parser/perl-HTML-Parser.nm b/perl-HTML-Parser/perl-HTML-Parser.nm
index b853fe096..dd491b6e2 100644
--- a/perl-HTML-Parser/perl-HTML-Parser.nm
+++ b/perl-HTML-Parser/perl-HTML-Parser.nm
@@ -42,4 +42,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/perl-XML-Parser/perl-XML-Parser.nm b/perl-XML-Parser/perl-XML-Parser.nm
index 588a6d997..6a2ce7a92 100644
--- a/perl-XML-Parser/perl-XML-Parser.nm
+++ b/perl-XML-Parser/perl-XML-Parser.nm
@@ -46,4 +46,8 @@ packages
 			perl
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/perl/perl.nm b/perl/perl.nm
index 19ff646ef..4ce92149e 100644
--- a/perl/perl.nm
+++ b/perl/perl.nm
@@ -138,17 +138,17 @@ packages
 			perl(:MODULE_COMPAT_5.14.2)
 			perl(:MODULE_COMPAT_5.14.1)
 			perl(:MODULE_COMPAT_5.14.0)
-	
+
 			# Threading provides
 			perl(:WITH_ITHREADS)
 			perl(:WITH_THREADS)
-	
+
 			# Largefile provides
 			perl(:WITH_LARGEFILES)
 
 			# PerlIO provides
 			perl(:WITH_PERLIO)
-	
+
 			# File provides
 			perl(abbrev.pl)
 			perl(assert.pl)
@@ -211,22 +211,22 @@ packages
 			perl\(Carp\)
 		end
 	end
-	
+
 	package perl-libs
 		template LIBS
-	
+
 		provides
 			libperl.so
 		end
-	
+
 		files
 			/usr/lib/perl5/CORE/libperl.so
 		end
 	end
-	
+
 	package perl-devel
 		template DEVEL
-	
+
 		files
 			/usr/bin/enc2xs
 			/usr/share/man/man1/enc2xs*
@@ -243,7 +243,7 @@ packages
 			/usr/share/man/man1/perlxs*
 		end
 	end
-	
+
 	#package perl-tests
 	#	summary = Testsuite to check your Perl installation.
 	#	description-perl-tests
@@ -256,12 +256,12 @@ packages
 	#		/usr/lib/perl5-tests
 	#	end
 	#end
-	
+
 	package perl-Archive-Extract
 		epoch = 0
 		version = 0.48
 		arch = noarch
-	
+
 		summary = Generic archive extracting mechanism.
 		description
 			Archive::Extract is a generic archive extraction mechanism.
@@ -270,18 +270,18 @@ packages
 		requires
 			%{perl_requires}
 		end
-	
+
 		files
 			/usr/share/perl5/Archive/Extract.pm
 			/usr/share/man/man3/Archive::Extract.3*
 		end
 	end
-	
+
 	package perl-Archive-Tar
 		epoch = 0
 		version = 1.76
 		arch = noarch
-	
+
 		summary = A module for Perl manipulation of .tar files.
 		description
 			Archive::Tar provides an object oriented mechanism for handling tar files. It
@@ -294,7 +294,7 @@ packages
 		requires
 			%{perl_requires}
 		end
-	
+
 		files
 			/usr/bin/ptar
 			/usr/bin/ptardiff
@@ -330,7 +330,7 @@ packages
 			/usr/share/man/man3/Class::ISA.3*
 		end
 	end
-	
+
 	package perl-Compress-Raw-Zlib
 		epoch = 0
 		version = 2.033
@@ -344,7 +344,7 @@ packages
 		requires
 			%{perl_requires}
 		end
-	
+
 		files
 			/usr/share/perl5/Compress/Raw/Zlib/
 			/usr/share/man/man3/Compress::Raw::Zlib*
@@ -387,22 +387,22 @@ packages
 			/usr/share/man/man3/CGI::*.3*
 		end
 	end
-	
+
 	package perl-CPAN
 		epoch = 0
 		version = 1.9600.01
 		arch = noarch
-	
+
 		summary = Query, download and build perl modules from CPAN sites.
 		description
 			Query, download and build perl modules from CPAN sites.
 		end
-	
+
 		requires
 			%{perl_requires}
 			perl(Digest::SHA)
 		end
-	
+
 		provides
 			cpan
 			cpan=$(version-perl-CPAN)
@@ -411,7 +411,7 @@ packages
 		filter_requires
 			perl\(Mac::BuildTools\)
 		end
-	
+
 		files
 			/usr/bin/cpan
 			/usr/share/perl5/CPAN*
@@ -477,20 +477,20 @@ packages
 		epoch = 0
 		version = 0.9103
 		arch = noarch
-	
+
 		summary = API & CLI access to the CPAN mirrors.
 		description
 			The CPANPLUS library is an API to the CPAN mirrors and a collection of
 			interactive shells, commandline programs, etc, that use this API.
 		end
-	
+
 		requires
 			%{perl_requires}
 			perl(Digest::SHA)
 			perl(Module::Pluggable)>=2.4
 			perl(Module::CoreList)
 		end
-	
+
 		provides
 			perl-CPANPLUS-Dist-Build=0.06
 		end
@@ -501,7 +501,7 @@ packages
 			Your::Module::Here
 			perl\(DBD::SQLite\)
 		end
-	
+
 		files
 			/usr/bin/cpan2dist
 			/usr/bin/cpanp
@@ -596,11 +596,11 @@ packages
 			/usr/share/man/man3/Digest::MD5.3*
 		end
 	end
-	
+
 	package perl-Digest-SHA
 		epoch = 0
 		version = 5.61
-	
+
 		summary = Perl extension for SHA-1/224/256/384/512.
 		description
 			Digest::SHA is a complete implementation of the NIST Secure Hash
@@ -608,13 +608,13 @@ packages
 			SHA-1, SHA-224, SHA-256, SHA-384, and SHA-512 message digests. The
 			module can handle all types of input, including partial-byte data.
 		end
-	
+
 		requires
 			%{perl_requires}
 			perl(Digest::base)
 			perl(MIME::Base64)
 		end
-	
+
 		files
 			/usr/bin/shasum
 			/usr/share/perl5/Digest/SHA*
@@ -896,34 +896,34 @@ packages
 			/usr/share/man/man3/JSON::PP::Boolean.3pm*
 		end
 	end
-	
+
 	package perl-Locale-Maketext-Simple
 		epoch = 0
 		version = 0.21
 		arch = noarch
 		license = MIT
-	
+
 		summary = Simple interface to Locale::Maketext::Lexicon.
 		description
 			This module is a simple wrapper around Locale::Maketext::Lexicon, designed
 			to alleviate the need of creating Language Classes for module authors.
 		end
-	
+
 		requires
 			%{perl_requires}
 		end
-	
+
 		files
 			/usr/share/perl5/Locale/Maketext/Simple.pm
 			/usr/share/man/man3/Locale::Maketext::Simple.*
 		end
 	end
-	
+
 	package perl-Log-Message
 		epoch = 0
 		version = 0.04
 		arch = noarch
-	
+
 		summary = Generic message storage mechanism.
 		description
 			Log::Message is a generic message storage mechanism. It allows you to store
@@ -933,11 +933,11 @@ packages
 			identify it or group it, and a level at which to handle the message (for
 			example, log it, or die with it).
 		end
-	
+
 		requires
 			%{perl_requires}
 		end
-	
+
 		provides
 			perl(Log::Message::Handlers)=%{version}
 		end
@@ -953,33 +953,33 @@ packages
 			/usr/share/man/man3/Log::Message::Item.3*
 		end
 	end
-	
+
 	package perl-Log-Message-Simple
 		epoch = 0
 		version = 0.08
 		arch = noarch
-	
+
 		summary = Simplified frontend to Log::Message.
 		description
 			This module provides standardized logging facilities using the
 			Log::Message module.
 		end
-	
+
 		requires
 			%{perl_requires}
 		end
-	
+
 		files
 			/usr/share/perl5/Log/Message/Simple.pm
 			/usr/share/man/man3/Log::Message::Simple.3*
 		end
 	end
-	
+
 	package perl-Module-Build
 		epoch = 0
 		version = 0.3800
 		arch = noarch
-	
+
 		summary = Perl module for building and installing Perl modules.
 		description
 			Module::Build is a system for building, testing, and installing Perl modules.
@@ -992,7 +992,7 @@ packages
 			are included with perl 5.6.0, and it works fine on perl 5.005 if you can
 			install a few additional modules.
 		end
-	
+
 		requires
 			%{perl_requires}
 			perl(Archive::Tar)>=1.08
@@ -1000,7 +1000,7 @@ packages
 			perl(ExtUtils::CBuilder)>=0.15
 			perl(ExtUtils::ParseXS)>=1.02
 		end
-	
+
 		files
 			/usr/bin/config_data
 			/usr/share/perl5/inc/
@@ -1010,23 +1010,23 @@ packages
 			/usr/share/man/man3/inc::latest.3*
 		end
 	end
-	
+
 	package perl-Module-CoreList
 		epoch = 0
 		version = 2.49_01
 		arch = noarch
-	
+
 		summary = Perl core modules indexed by perl versions.
 		description
 			Module::CoreList contains the hash of hashes %Module::CoreList::version, this
 			is keyed on perl version as indicated in $].  The second level hash is module
 			=> version pairs.
 		end
-	
+
 		requires
 			%{perl_requires}
 		end
-	
+
 		files
 			/usr/bin/corelist
 			/usr/share/perl5/Module/CoreList.pm
@@ -1034,54 +1034,54 @@ packages
 			/usr/share/man/man3/Module::CoreList*
 		end
 	end
-	
+
 	package perl-Module-Load
 		epoch = 0
 		version = 0.18
 		arch = noarch
-	
+
 		summary = Runtime require of both modules and files.
 		description
 			Module::Load eliminates the need to know whether you are trying to require
 			either a file or a module.
 		end
-	
+
 		requires
 			%{perl_requires}
 		end
-	
+
 		files
 			/usr/share/perl5/Module/Load.pm
 			/usr/share/man/man3/Module::Load.*
 		end
 	end
-	
+
 	package perl-Module-Load-Conditional
 		epoch = 0
 		version = 0.44
 		arch = noarch
-	
+
 		summary = Looking up module information / loading at runtime.
 		description
 			Module::Load::Conditional provides simple ways to query and possibly load
 			any of the modules you have installed on your system during runtime.
 		end
-	
+
 		requires
 			%{perl_requires}
 		end
-	
+
 		files
 			/usr/share/perl5/Module/Load/
 			/usr/share/man/man3/Module::Load::Conditional*
 		end
 	end
-	
+
 	package perl-Module-Loaded
 		epoch = 0
 		version = 0.06
 		arch = noarch
-	
+
 		summary = Mark modules as loaded or unloaded.
 		description
 			When testing applications, often you find yourself needing to provide
@@ -1090,11 +1090,11 @@ packages
 			modules as loaded, so they are not attempted to be loaded by perl, this module
 			offers you a very simple way to mark modules as loaded and/or unloaded.
 		end
-	
+
 		requires
 			%{perl_requires}
 		end
-	
+
 		files
 			/usr/share/perl5/Module/Loaded.pm
 			/usr/share/man/man3/Module::Loaded*
@@ -1131,11 +1131,11 @@ packages
 			Provides a simple but, hopefully, extensible way of having 'plugins' for
 			your module.
 		end
-	
+
 		requires
 			%{perl_requires}
 		end
-	
+
 		files
 			/usr/share/perl5/Devel/InnerPackage.pm
 			/usr/share/perl5/Module/Pluggable/
@@ -1149,7 +1149,7 @@ packages
 		epoch = 0
 		version = 0.38
 		arch = noarch
-	
+
 		summary = Perl module that allows per object accessors.
 		description
 			Object::Accessor provides an interface to create per object accessors (as
@@ -1159,25 +1159,25 @@ packages
 		requires
 			%{perl_requires}
 		end
-	
+
 		files
 			/usr/share/perl5/Object/
 			/usr/share/man/man3/Object::Accessor*
 		end
 	end
-	
+
 	package perl-Package-Constants
 		epoch = 0
 		version = 0.02
 		arch = noarch
-	
+
 		summary = List all constants declared in a package.
 		description
 			Package::Constants lists all the constants defined in a certain package.  This
 			can be useful for, among others, setting up an autogenerated @EXPORT/@EXPORT_OK
 			for a Constants.pm file.
 		end
-	
+
 		requires
 			%{perl_requires}
 		end
@@ -1187,17 +1187,17 @@ packages
 			/usr/share/man/man3/Package::Constants*
 		end
 	end
-	
+
 	package perl-Params-Check
 		epoch = 0
 		version = 0.28
 		arch = noarch
-	
+
 		summary = Generic input parsing/checking mechanism.
 		description
 			Params::Check is a generic input parsing/checking mechanism.
 		end
-	
+
 		requires
 			%{perl_requires}
 		end
@@ -1205,13 +1205,13 @@ packages
 		provides
 			perl(Params::Check)
 		end
-	
+
 		files
 			/usr/share/perl5/Params/
 			/usr/share/man/man3/Params::Check*
 		end
 	end
-	
+
 	package perl-Parse-CPAN-Meta
 		epoch = 0
 		version = 1.4401
@@ -1222,7 +1222,7 @@ packages
 			Parse::CPAN::Meta is a parser for META.yml files, based on the parser half of
 			YAML::Tiny.
 		end
-	
+
 		requires
 			%{perl_requires}
 		end
@@ -1232,17 +1232,17 @@ packages
 			/usr/share/man/man3/Parse::CPAN::Meta.3*
 		end
 	end
-	
+
 	package perl-Path-Tools
 		epoch = 0
 		version = 3.33
 		license = (GPL+ or Artistic) and BSD
-	
+
 		summary = PathTools Perl module (Cwd, File::Spec).
 		description
 			PathTools Perl module (Cwd, File::Spec).
 		end
-	
+
 		requires
 			%{perl_requires}
 		end
@@ -1250,7 +1250,7 @@ packages
 		filter_requires
 			perl\(VMS\:\:Filespec\)
 		end
-	
+
 		files
 			/usr/lib/perl5/Cwd.pm
 			/usr/lib/perl5/File/Spec*
@@ -1284,18 +1284,18 @@ packages
 			/usr/share/man/man3/Perl::OSType.3pm*
 		end
 	end
-	
+
 	package perl-Pod-Escapes
 		epoch= 0
 		version = 1.04
 		arch = noarch
-	
+
 		summary = Perl module for resolving POD escape sequences.
 		description
 			This module provides things that are useful in decoding Pod E<...> sequences.
 			Presumably, it should be used only by Pod parsers and/or formatters.
 		end
-	
+
 		requires
 			%{perl_requires}
 		end
@@ -1303,25 +1303,25 @@ packages
 		filter_requires
 			%{perl_filter_requires}
 		end
-	
+
 		files
 			/usr/share/perl5/Pod/Escapes.pm
 			/usr/share/man/man3/Pod::Escapes.*
 		end
 	end
-	
+
 	package perl-Pod-Simple
 		epoch = 0
 		version = 3.16
 		arch = noarch
-	
+
 		summary = Framework for parsing POD documentation.
 		description
 			Pod::Simple is a Perl library for parsing text in the Pod (plain old
 			documentation) markup language that is typically used for writing
 			documentation for Perl and for Perl modules.
 		end
-	
+
 		requires
 			%{perl_requires}
 		end
@@ -1329,7 +1329,7 @@ packages
 		filter_requires
 			%{perl_filter_requires}
 		end
-	
+
 		files
 			/usr/share/perl5/Pod/Simple/
 			/usr/share/perl5/Pod/Simple.pm
@@ -1362,7 +1362,7 @@ packages
 			/usr/share/man/man3/Scalar::Util*
 		end
 	end
-	
+
 	package perl-Term-UI
 		epoch = 0
 		version = 0.26
@@ -1654,4 +1654,8 @@ packages
 		files
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/pinentry/pinentry.nm b/pinentry/pinentry.nm
index ce91c338b..28353f7ea 100644
--- a/pinentry/pinentry.nm
+++ b/pinentry/pinentry.nm
@@ -37,4 +37,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/pixman/pixman.nm b/pixman/pixman.nm
index 850466a1f..fa240805a 100644
--- a/pixman/pixman.nm
+++ b/pixman/pixman.nm
@@ -28,8 +28,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/pkg-config/pkg-config.nm b/pkg-config/pkg-config.nm
index 25b01b349..ef0318af5 100644
--- a/pkg-config/pkg-config.nm
+++ b/pkg-config/pkg-config.nm
@@ -40,4 +40,8 @@ packages
 		# Say we provide an alternative spelling of the package name.
 		provides = pkgconfig
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/polkit/polkit.nm b/polkit/polkit.nm
index ac0e03916..3c8468121 100644
--- a/polkit/polkit.nm
+++ b/polkit/polkit.nm
@@ -47,8 +47,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/popt/popt.nm b/popt/popt.nm
index e998cf85f..9407ce2da 100644
--- a/popt/popt.nm
+++ b/popt/popt.nm
@@ -34,8 +34,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/powertop/powertop.nm b/powertop/powertop.nm
index 5ea577ead..e6c250cc5 100644
--- a/powertop/powertop.nm
+++ b/powertop/powertop.nm
@@ -28,4 +28,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/ppl/ppl.nm b/ppl/ppl.nm
index 05a73e9e4..f4372b0fe 100644
--- a/ppl/ppl.nm
+++ b/ppl/ppl.nm
@@ -60,4 +60,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/ppp/ppp.nm b/ppp/ppp.nm
index 3e35b44c1..8930a9278 100644
--- a/ppp/ppp.nm
+++ b/ppp/ppp.nm
@@ -61,8 +61,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/pptp/pptp.nm b/pptp/pptp.nm
index 0ce873d86..8fb2822cc 100644
--- a/pptp/pptp.nm
+++ b/pptp/pptp.nm
@@ -45,4 +45,8 @@ packages
 			iproute2
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/procps/procps.nm b/procps/procps.nm
index 5c50a597a..c25c6ca0f 100644
--- a/procps/procps.nm
+++ b/procps/procps.nm
@@ -41,4 +41,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/psmisc/psmisc.nm b/psmisc/psmisc.nm
index 3601591cf..3e9acadd7 100644
--- a/psmisc/psmisc.nm
+++ b/psmisc/psmisc.nm
@@ -36,4 +36,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/pth/pth.nm b/pth/pth.nm
index 832d2abbc..345c159e6 100644
--- a/pth/pth.nm
+++ b/pth/pth.nm
@@ -40,8 +40,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/pyQt/pyQt.nm b/pyQt/pyQt.nm
index 513e2cbaa..5171e4855 100644
--- a/pyQt/pyQt.nm
+++ b/pyQt/pyQt.nm
@@ -56,10 +56,10 @@ packages
 			sip
 		end
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
-	
+
 		files
 			/usr/bin
 			/usr/lib/python*/site-packages/PyQt4/pyqtconfig*
@@ -67,4 +67,8 @@ packages
 			/usr/share/sip
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/pyfire/pyfire.nm b/pyfire/pyfire.nm
index 03b674b4d..7aab8b63c 100644
--- a/pyfire/pyfire.nm
+++ b/pyfire/pyfire.nm
@@ -35,4 +35,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/pygobject2/pygobject2.nm b/pygobject2/pygobject2.nm
index ccdcc43e0..6938a5604 100644
--- a/pygobject2/pygobject2.nm
+++ b/pygobject2/pygobject2.nm
@@ -43,24 +43,28 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-codegen
 		summary = The code generation program for PyGObject.
 		description
 			This package contains the C code generation
 			program for PyGObject.
 		end
-	
+
 		files
 			/usr/bin/pygobject-codegen-2.0
 			/usr/share/pygobject/2.0/codegen
 		end
 	end
-	
+
 	package %{name}-devel
 		requires
 			glib2-devel
 			%{name}-codegen
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/pyliblzma/pyliblzma.nm b/pyliblzma/pyliblzma.nm
index 48450d735..a9035a506 100644
--- a/pyliblzma/pyliblzma.nm
+++ b/pyliblzma/pyliblzma.nm
@@ -45,4 +45,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/python-cairo/python-cairo.nm b/python-cairo/python-cairo.nm
index 3c316c862..e1e90fcf7 100644
--- a/python-cairo/python-cairo.nm
+++ b/python-cairo/python-cairo.nm
@@ -32,11 +32,15 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		# The development headers need the cairo headers.
 		requires
 			cairo-devel
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/python-cryptsetup/python-cryptsetup.nm b/python-cryptsetup/python-cryptsetup.nm
index e35d26c36..e333fe719 100644
--- a/python-cryptsetup/python-cryptsetup.nm
+++ b/python-cryptsetup/python-cryptsetup.nm
@@ -36,4 +36,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/python-dbus/python-dbus.nm b/python-dbus/python-dbus.nm
index 981faba6f..0e2e8df6e 100644
--- a/python-dbus/python-dbus.nm
+++ b/python-dbus/python-dbus.nm
@@ -32,8 +32,12 @@ end
 
 packages
 	package %{name}
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/python-gudev/python-gudev.nm b/python-gudev/python-gudev.nm
index 18de1c245..eff0beb81 100644
--- a/python-gudev/python-gudev.nm
+++ b/python-gudev/python-gudev.nm
@@ -45,4 +45,8 @@ packages
 			pygobject2
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/python-m2crypto/python-m2crypto.nm b/python-m2crypto/python-m2crypto.nm
index c5a90eb69..1a6321775 100644
--- a/python-m2crypto/python-m2crypto.nm
+++ b/python-m2crypto/python-m2crypto.nm
@@ -39,4 +39,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/python-netfilter_conntrack/python-netfilter_conntrack.nm b/python-netfilter_conntrack/python-netfilter_conntrack.nm
index f8ca75859..8740400a9 100644
--- a/python-netfilter_conntrack/python-netfilter_conntrack.nm
+++ b/python-netfilter_conntrack/python-netfilter_conntrack.nm
@@ -37,4 +37,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/python-parted/python-parted.nm b/python-parted/python-parted.nm
index a4d46d38f..24f9cbf88 100644
--- a/python-parted/python-parted.nm
+++ b/python-parted/python-parted.nm
@@ -36,4 +36,8 @@ packages
 			python-decorator
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/python-piksemel/python-piksemel.nm b/python-piksemel/python-piksemel.nm
index c85cf9c05..366a6e365 100644
--- a/python-piksemel/python-piksemel.nm
+++ b/python-piksemel/python-piksemel.nm
@@ -41,4 +41,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/python-pyaspects/python-pyaspects.nm b/python-pyaspects/python-pyaspects.nm
index f435b7263..db3422cb6 100644
--- a/python-pyaspects/python-pyaspects.nm
+++ b/python-pyaspects/python-pyaspects.nm
@@ -36,4 +36,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/python-pyblock/python-pyblock.nm b/python-pyblock/python-pyblock.nm
index de70bbbbd..8f191725d 100644
--- a/python-pyblock/python-pyblock.nm
+++ b/python-pyblock/python-pyblock.nm
@@ -43,4 +43,8 @@ end
 
 packages
 	package python-%{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/python-pycurl/python-pycurl.nm b/python-pycurl/python-pycurl.nm
index 9d8c942e1..b1e600eae 100644
--- a/python-pycurl/python-pycurl.nm
+++ b/python-pycurl/python-pycurl.nm
@@ -56,4 +56,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/python-qtermwidget/python-qtermwidget.nm b/python-qtermwidget/python-qtermwidget.nm
index e1bd3940a..5c314ff96 100644
--- a/python-qtermwidget/python-qtermwidget.nm
+++ b/python-qtermwidget/python-qtermwidget.nm
@@ -42,4 +42,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/python/python.nm b/python/python.nm
index 0da36063b..34582210e 100644
--- a/python/python.nm
+++ b/python/python.nm
@@ -87,9 +87,13 @@ packages
 
 	package %{name}-devel
 		template DEVEL
-	
+
 		files += \
 			!/usr/lib/python*/config/Makefile \
 			!/usr/include/python*/pyconfig.h
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/pyxattr/pyxattr.nm b/pyxattr/pyxattr.nm
index 8b323b86f..9345fa6bf 100644
--- a/pyxattr/pyxattr.nm
+++ b/pyxattr/pyxattr.nm
@@ -37,4 +37,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/qemu/qemu.nm b/qemu/qemu.nm
index 8bce0436b..3499c4dee 100644
--- a/qemu/qemu.nm
+++ b/qemu/qemu.nm
@@ -54,4 +54,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/qt/qt.nm b/qt/qt.nm
index be9f07f31..b9a952fc7 100644
--- a/qt/qt.nm
+++ b/qt/qt.nm
@@ -117,10 +117,10 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
-	
+
 		files
 			/usr/lib/*.prl \
 			/usr/lib/qt4/q3porting.xml \
@@ -129,4 +129,8 @@ packages
 			/usr/lib/qt4/mkspecs
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/qtermwidget/qtermwidget.nm b/qtermwidget/qtermwidget.nm
index 05a14b32d..e5cf76a62 100644
--- a/qtermwidget/qtermwidget.nm
+++ b/qtermwidget/qtermwidget.nm
@@ -53,8 +53,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/quagga/quagga.nm b/quagga/quagga.nm
index 459fc4410..57dfbeb08 100644
--- a/quagga/quagga.nm
+++ b/quagga/quagga.nm
@@ -49,4 +49,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/radvd/radvd.nm b/radvd/radvd.nm
index 932c991dc..7c170ed45 100644
--- a/radvd/radvd.nm
+++ b/radvd/radvd.nm
@@ -89,4 +89,8 @@ packages
 			/bin/systemctl try-restart radvd.service >/dev/null 2>&1 || :
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/readline/readline.nm b/readline/readline.nm
index 1d9095d86..0c57490c2 100644
--- a/readline/readline.nm
+++ b/readline/readline.nm
@@ -55,4 +55,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/reiser4progs/reiser4progs.nm b/reiser4progs/reiser4progs.nm
index 02c89689c..12b3d6a42 100644
--- a/reiser4progs/reiser4progs.nm
+++ b/reiser4progs/reiser4progs.nm
@@ -58,8 +58,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/reiserfsprogs/reiserfsprogs.nm b/reiserfsprogs/reiserfsprogs.nm
index 7130e20fb..bd3bee0f7 100644
--- a/reiserfsprogs/reiserfsprogs.nm
+++ b/reiserfsprogs/reiserfsprogs.nm
@@ -33,4 +33,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/rrdtool/rrdtool.nm b/rrdtool/rrdtool.nm
index 3384a59b5..cbfb3d44c 100644
--- a/rrdtool/rrdtool.nm
+++ b/rrdtool/rrdtool.nm
@@ -61,12 +61,16 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-libs
 		template LIBS
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/rsync/rsync.nm b/rsync/rsync.nm
index 4cc20d8c4..3af7d69f9 100644
--- a/rsync/rsync.nm
+++ b/rsync/rsync.nm
@@ -66,4 +66,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/rsyslog/rsyslog.nm b/rsyslog/rsyslog.nm
index dfe904b32..d076187e3 100644
--- a/rsyslog/rsyslog.nm
+++ b/rsyslog/rsyslog.nm
@@ -94,4 +94,8 @@ packages
 			/bin/systemctl try-restart rsyslog.service >/dev/null 2>&1 || :
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/rtorrent/rtorrent.nm b/rtorrent/rtorrent.nm
index 320436c03..ae55fe5bd 100644
--- a/rtorrent/rtorrent.nm
+++ b/rtorrent/rtorrent.nm
@@ -37,4 +37,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/samba/samba.nm b/samba/samba.nm
index e0f553788..2a5cef06d 100644
--- a/samba/samba.nm
+++ b/samba/samba.nm
@@ -98,4 +98,8 @@ packages
 
 		requires += %{name}-libs=%{thisver}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/sane/sane.nm b/sane/sane.nm
index 8d6c3398a..54b8d0a8d 100644
--- a/sane/sane.nm
+++ b/sane/sane.nm
@@ -45,12 +45,16 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-libs
 		template LIBS
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/screen/screen.nm b/screen/screen.nm
index c6d685aeb..e83b3fa68 100644
--- a/screen/screen.nm
+++ b/screen/screen.nm
@@ -46,4 +46,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/sdl/sdl.nm b/sdl/sdl.nm
index 200dc5646..5e22e0591 100644
--- a/sdl/sdl.nm
+++ b/sdl/sdl.nm
@@ -31,8 +31,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/sed/sed.nm b/sed/sed.nm
index 49e71cd89..5bbb61a94 100644
--- a/sed/sed.nm
+++ b/sed/sed.nm
@@ -40,4 +40,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/setup/setup.nm b/setup/setup.nm
index 58641f306..18d3738a6 100644
--- a/setup/setup.nm
+++ b/setup/setup.nm
@@ -66,4 +66,8 @@ packages
 			/etc/shells
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/sg3-utils/sg3-utils.nm b/sg3-utils/sg3-utils.nm
index 3b97ee071..07ec394ff 100644
--- a/sg3-utils/sg3-utils.nm
+++ b/sg3-utils/sg3-utils.nm
@@ -26,12 +26,16 @@ sources    = %{thisapp}.tgz
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-libs
 		template LIBS
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/sgml-common/sgml-common.nm b/sgml-common/sgml-common.nm
index a6e6d8eb6..e1e3f13f3 100644
--- a/sgml-common/sgml-common.nm
+++ b/sgml-common/sgml-common.nm
@@ -44,7 +44,7 @@ build
 	install_cmds
 		mkdir -pv %{BUILDROOT}/etc/{sg,x}ml/docbook
 		mkdir -pv %{BUILDROOT}/usr/share/sgml/docbook
-	
+
 		# Touch SGML catalog
 		touch %{BUILDROOT}/etc/sgml/catalog
 
diff --git a/shadow-utils/shadow-utils.nm b/shadow-utils/shadow-utils.nm
index e6fbf60ab..66cd466df 100644
--- a/shadow-utils/shadow-utils.nm
+++ b/shadow-utils/shadow-utils.nm
@@ -79,4 +79,8 @@ packages
 			/etc/default/useradd
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/sip/sip.nm b/sip/sip.nm
index 5fe790cc9..e6a30dcae 100644
--- a/sip/sip.nm
+++ b/sip/sip.nm
@@ -41,12 +41,16 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
-	
+
 		files += /usr/bin/sip
-	
+
 		requires = sip
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/slang/slang.nm b/slang/slang.nm
index 819431e3f..a572e2439 100644
--- a/slang/slang.nm
+++ b/slang/slang.nm
@@ -42,8 +42,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/smartmontools/smartmontools.nm b/smartmontools/smartmontools.nm
index c35d048e1..cf1605340 100644
--- a/smartmontools/smartmontools.nm
+++ b/smartmontools/smartmontools.nm
@@ -42,4 +42,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/sqlite/sqlite.nm b/sqlite/sqlite.nm
index 76d5effb5..530f18019 100644
--- a/sqlite/sqlite.nm
+++ b/sqlite/sqlite.nm
@@ -65,4 +65,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/squashfs-tools/squashfs-tools.nm b/squashfs-tools/squashfs-tools.nm
index ac328e216..f687d8502 100644
--- a/squashfs-tools/squashfs-tools.nm
+++ b/squashfs-tools/squashfs-tools.nm
@@ -43,4 +43,8 @@ packages
 	package %{name}
 		requires = libgcc_s.so.1
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/squid/squid.nm b/squid/squid.nm
index bc6e65132..f41eb27b9 100644
--- a/squid/squid.nm
+++ b/squid/squid.nm
@@ -99,7 +99,7 @@ build
 		echo "visible_hostname %{DISTRO_NAME}" >> %{BUILDROOT}/etc/squid/squid.conf
 		echo "cache_effective_user squid" >> %{BUILDROOT}/etc/squid/squid.conf
 		echo "cache_effective_group squid" >> %{BUILDROOT}/etc/squid/squid.conf
-		
+
 		chown -Rv squid:squid %{BUILDROOT}/var/log/squid %{BUILDROOT}/var/log/cache %{BUILDROOT}/var/cache/squid
 		chmod 600 %{BUILDROOT}/var/cache/squid
 		mkdir -pv %{BUILDROOT}/etc/sysconfig
@@ -151,4 +151,8 @@ packages
 
 		filter_requires = perl\(Authen::Smb\)
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/squidGuard/squidGuard.nm b/squidGuard/squidGuard.nm
index ce0e4199a..a45597b70 100644
--- a/squidGuard/squidGuard.nm
+++ b/squidGuard/squidGuard.nm
@@ -53,4 +53,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/strace/strace.nm b/strace/strace.nm
index 5497a556c..7aec6d767 100644
--- a/strace/strace.nm
+++ b/strace/strace.nm
@@ -31,4 +31,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm
index 44286b614..2db621423 100644
--- a/strongswan/strongswan.nm
+++ b/strongswan/strongswan.nm
@@ -63,4 +63,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/sudo/sudo.nm b/sudo/sudo.nm
index 45dfc1704..92d2d1e38 100644
--- a/sudo/sudo.nm
+++ b/sudo/sudo.nm
@@ -59,4 +59,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/suricata/suricata.nm b/suricata/suricata.nm
index d1e67e237..f06c66c4b 100644
--- a/suricata/suricata.nm
+++ b/suricata/suricata.nm
@@ -78,8 +78,12 @@ packages
 		end
 
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/swig/swig.nm b/swig/swig.nm
index 2ce14b632..e3e68cc77 100644
--- a/swig/swig.nm
+++ b/swig/swig.nm
@@ -46,4 +46,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/sysfsutils/sysfsutils.nm b/sysfsutils/sysfsutils.nm
index 909e005ec..3ace7b4b4 100644
--- a/sysfsutils/sysfsutils.nm
+++ b/sysfsutils/sysfsutils.nm
@@ -27,8 +27,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/syslinux/syslinux.nm b/syslinux/syslinux.nm
index db8ff6100..36681f75a 100644
--- a/syslinux/syslinux.nm
+++ b/syslinux/syslinux.nm
@@ -26,7 +26,7 @@ build
 		nasm
 		python-devel
 	end
-	
+
 	CFLAGS = -Werror -Wno-unused -finline-limit=2000
 
 	prepare_cmds
@@ -63,4 +63,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 129e8bacd..d8032c298 100644
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -141,7 +141,7 @@ packages
 			/bin/systemctl try-restart systemd-logind.service >/dev/null 2>&1 || :
 		end
 	end
-	
+
 	# Package information for systemd-units
 	package %{name}-units
 		summary =  Configuration files, directories and installation tool for systemd.
@@ -149,7 +149,7 @@ packages
 			This package contains all needed configuration files, directories
 			and installation / configuration tool for systemd.
 		end
-	
+
 		files
 			/etc/systemd/system
 			/etc/tmpfiles.d
@@ -179,8 +179,12 @@ packages
 			systemctl daemon-reload > /dev/null 2>&1 || :
 		end
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/sysvinit/sysvinit.nm b/sysvinit/sysvinit.nm
index 50a23e06a..cdbed7f69 100644
--- a/sysvinit/sysvinit.nm
+++ b/sysvinit/sysvinit.nm
@@ -46,4 +46,8 @@ packages
 	package %{name}
 		groups += Base
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/tar/tar.nm b/tar/tar.nm
index 74bd88e6d..b4fb03122 100644
--- a/tar/tar.nm
+++ b/tar/tar.nm
@@ -55,4 +55,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/tcl/tcl.nm b/tcl/tcl.nm
index 528b3dbdb..0ce3438a8 100644
--- a/tcl/tcl.nm
+++ b/tcl/tcl.nm
@@ -58,4 +58,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/tcpdump/tcpdump.nm b/tcpdump/tcpdump.nm
index 849b84f53..d491340aa 100644
--- a/tcpdump/tcpdump.nm
+++ b/tcpdump/tcpdump.nm
@@ -37,4 +37,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/telnet/telnet.nm b/telnet/telnet.nm
index 38da6f194..a538c7a9c 100644
--- a/telnet/telnet.nm
+++ b/telnet/telnet.nm
@@ -87,4 +87,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/texinfo/texinfo.nm b/texinfo/texinfo.nm
index 733bc2147..a59e45017 100644
--- a/texinfo/texinfo.nm
+++ b/texinfo/texinfo.nm
@@ -37,4 +37,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/tinc/tinc.nm b/tinc/tinc.nm
index 6ad56184e..1bf179b9f 100644
--- a/tinc/tinc.nm
+++ b/tinc/tinc.nm
@@ -35,4 +35,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/traceroute/traceroute.nm b/traceroute/traceroute.nm
index 9197cb24c..5d3a7f8a1 100644
--- a/traceroute/traceroute.nm
+++ b/traceroute/traceroute.nm
@@ -40,4 +40,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/transmission/transmission.nm b/transmission/transmission.nm
index dbca120e2..7aaf8f23b 100644
--- a/transmission/transmission.nm
+++ b/transmission/transmission.nm
@@ -32,4 +32,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/tunctl/tunctl.nm b/tunctl/tunctl.nm
index 21c542c30..2e519829f 100644
--- a/tunctl/tunctl.nm
+++ b/tunctl/tunctl.nm
@@ -36,4 +36,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/udev/udev.nm b/udev/udev.nm
index f7375ab70..1629b1cea 100644
--- a/udev/udev.nm
+++ b/udev/udev.nm
@@ -72,4 +72,8 @@ packages
 	package lib%{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/udisks/udisks.nm b/udisks/udisks.nm
index 188edc50e..b6288f365 100644
--- a/udisks/udisks.nm
+++ b/udisks/udisks.nm
@@ -53,4 +53,8 @@ packages
 			xfsprogs
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/ulogd2/ulogd2.nm b/ulogd2/ulogd2.nm
index c383406d5..fd1a7899d 100644
--- a/ulogd2/ulogd2.nm
+++ b/ulogd2/ulogd2.nm
@@ -48,4 +48,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/unzip/unzip.nm b/unzip/unzip.nm
index a385946ae..9a1ab51b9 100644
--- a/unzip/unzip.nm
+++ b/unzip/unzip.nm
@@ -52,4 +52,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/upower/upower.nm b/upower/upower.nm
index a3fdc088d..67949dd25 100644
--- a/upower/upower.nm
+++ b/upower/upower.nm
@@ -41,12 +41,16 @@ packages
 	package %{name}
 		requires = udev util-linux
 	end
-	
+
 	package %{name}-libs
 		template LIBS
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/usb-modeswitch/usb-modeswitch.nm b/usb-modeswitch/usb-modeswitch.nm
index dc659bae9..2e8ebada3 100644
--- a/usb-modeswitch/usb-modeswitch.nm
+++ b/usb-modeswitch/usb-modeswitch.nm
@@ -30,4 +30,8 @@ packages
 	package %{name}
 		requires += usb-modeswitch-data
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/usbutils/usbutils.nm b/usbutils/usbutils.nm
index 7319cae5d..6a24f0966 100644
--- a/usbutils/usbutils.nm
+++ b/usbutils/usbutils.nm
@@ -37,4 +37,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/ustr/ustr.nm b/ustr/ustr.nm
index bbf76ca2e..a8e8eb917 100644
--- a/ustr/ustr.nm
+++ b/ustr/ustr.nm
@@ -39,10 +39,10 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
-	
+
 		files
 			/usr/bin/
 			/usr/include/
@@ -50,4 +50,8 @@ packages
 			*/lib/*.so
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm
index 7c1c55828..351c79496 100644
--- a/util-linux/util-linux.nm
+++ b/util-linux/util-linux.nm
@@ -124,7 +124,7 @@ packages
 			This is the block device identification library,
 			part of util-linux.
 		end
-	
+
 		files
 			/lib/libblkid.*
 		end
@@ -134,7 +134,7 @@ packages
 	package libblkid-devel
 		summary =  Development library and header of libblkid.
 		description = %{summary}
-	
+
 		files
 			/usr/include/blkid/
 			/usr/lib/libblkid.*
@@ -150,7 +150,7 @@ packages
 			This is the universally unique ID library,
 			part of util-linux.
 		end
-	
+
 		files
 			/lib/libuuid.*
 		end
@@ -160,7 +160,7 @@ packages
 	package libuuid-devel
 		summary =  Development library and header of libuuid.
 		description = %{summary}
-	
+
 		files
 			/usr/include/uuid/
 			/usr/lib/libuuid.*
@@ -176,7 +176,7 @@ packages
 			This is the device mounting library,
 			part of util-linux.
 		end
-	
+
 		files
 			/lib/libmount.*
 		end
@@ -186,7 +186,7 @@ packages
 	package libmount-devel
 		summary =  Development library and header of libmount.
 		description = %{summary}
-	
+
 		files
 			/usr/include/mount/
 			/usr/lib/libmount.*
@@ -194,4 +194,8 @@ packages
 			/usr/share/man/man3/*mount*
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/vala/vala.nm b/vala/vala.nm
index 84b2f028e..015c06a78 100644
--- a/vala/vala.nm
+++ b/vala/vala.nm
@@ -42,8 +42,12 @@ packages
 	package %{name}
 		requires = glib2
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/vim/vim.nm b/vim/vim.nm
index 20ba02658..5ce9fd807 100644
--- a/vim/vim.nm
+++ b/vim/vim.nm
@@ -53,4 +53,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/vlan/vlan.nm b/vlan/vlan.nm
index 18f4d7cab..c9ddf1000 100644
--- a/vlan/vlan.nm
+++ b/vlan/vlan.nm
@@ -38,4 +38,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/vsftpd/vsftpd.nm b/vsftpd/vsftpd.nm
index f34c677da..8eb1f4cda 100644
--- a/vsftpd/vsftpd.nm
+++ b/vsftpd/vsftpd.nm
@@ -53,4 +53,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/wavemon/wavemon.nm b/wavemon/wavemon.nm
index e86f903b5..ea4f1a0d2 100644
--- a/wavemon/wavemon.nm
+++ b/wavemon/wavemon.nm
@@ -36,4 +36,8 @@ packages
 	package %{name}
 		requires = wireless-tools
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/wget/wget.nm b/wget/wget.nm
index 29d21c906..7803a2cb9 100644
--- a/wget/wget.nm
+++ b/wget/wget.nm
@@ -38,4 +38,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/which/which.nm b/which/which.nm
index aab6f0067..545791245 100644
--- a/which/which.nm
+++ b/which/which.nm
@@ -21,4 +21,8 @@ source_dl  = http://carlo17.home.xs4all.nl/which/
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/wireless-tools/wireless-tools.nm b/wireless-tools/wireless-tools.nm
index c7faadaa5..44a5f73d4 100644
--- a/wireless-tools/wireless-tools.nm
+++ b/wireless-tools/wireless-tools.nm
@@ -45,8 +45,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/wpa_supplicant/wpa_supplicant.nm b/wpa_supplicant/wpa_supplicant.nm
index 05730fd2c..fb0af1a83 100644
--- a/wpa_supplicant/wpa_supplicant.nm
+++ b/wpa_supplicant/wpa_supplicant.nm
@@ -54,4 +54,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/xcb-util/xcb-util.nm b/xcb-util/xcb-util.nm
index 4d7b580a5..ebeb037d5 100644
--- a/xcb-util/xcb-util.nm
+++ b/xcb-util/xcb-util.nm
@@ -44,8 +44,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/xen/xen.nm b/xen/xen.nm
index f0a8e3992..ab4144569 100644
--- a/xen/xen.nm
+++ b/xen/xen.nm
@@ -110,4 +110,8 @@ packages
 			develop applications which manage Xen virtual machines.
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/xfsprogs/xfsprogs.nm b/xfsprogs/xfsprogs.nm
index 24dfbc0ac..51e2d736a 100644
--- a/xfsprogs/xfsprogs.nm
+++ b/xfsprogs/xfsprogs.nm
@@ -63,8 +63,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/xmlto/xmlto.nm b/xmlto/xmlto.nm
index b0cf50093..3ca124098 100644
--- a/xmlto/xmlto.nm
+++ b/xmlto/xmlto.nm
@@ -43,4 +43,8 @@ packages
 			util-linux
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/xorg-x11-drv-ati/xorg-x11-drv-ati.nm b/xorg-x11-drv-ati/xorg-x11-drv-ati.nm
index ce5358a09..2a76462c0 100644
--- a/xorg-x11-drv-ati/xorg-x11-drv-ati.nm
+++ b/xorg-x11-drv-ati/xorg-x11-drv-ati.nm
@@ -48,4 +48,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm b/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm
index b85e2428e..56b0c5693 100644
--- a/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm
+++ b/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm
@@ -48,4 +48,8 @@ packages
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/xorg-x11-drv-intel/xorg-x11-drv-intel.nm b/xorg-x11-drv-intel/xorg-x11-drv-intel.nm
index c72bddca5..9c2ae1d0f 100644
--- a/xorg-x11-drv-intel/xorg-x11-drv-intel.nm
+++ b/xorg-x11-drv-intel/xorg-x11-drv-intel.nm
@@ -63,4 +63,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm b/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm
index 03f6f9a0c..bcaa6a738 100644
--- a/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm
+++ b/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm
@@ -42,4 +42,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm b/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm
index 8badb77a2..5289c41e0 100644
--- a/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm
+++ b/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm
@@ -43,4 +43,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/xorg-x11-drv-nv/xorg-x11-drv-nv.nm b/xorg-x11-drv-nv/xorg-x11-drv-nv.nm
index 91fd257a9..af61d9e99 100644
--- a/xorg-x11-drv-nv/xorg-x11-drv-nv.nm
+++ b/xorg-x11-drv-nv/xorg-x11-drv-nv.nm
@@ -52,4 +52,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm b/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm
index e3d57f0d0..87d378fae 100644
--- a/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm
+++ b/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm
@@ -53,8 +53,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm b/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm
index 66fc404ce..eee113a7f 100644
--- a/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm
+++ b/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm
@@ -47,4 +47,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm b/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm
index a24655fae..15d6eaabe 100644
--- a/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm
+++ b/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm
@@ -47,4 +47,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/xorg-x11-font-utils/xorg-x11-font-utils.nm b/xorg-x11-font-utils/xorg-x11-font-utils.nm
index 8bf368f33..b849bd4cd 100644
--- a/xorg-x11-font-utils/xorg-x11-font-utils.nm
+++ b/xorg-x11-font-utils/xorg-x11-font-utils.nm
@@ -36,7 +36,7 @@ build
 		libfontenc-devel
 		pkg-config
 		xorg-x11-proto-devel
-		zlib-devel		
+		zlib-devel
 	end
 
 	configure_options += \
@@ -84,4 +84,8 @@ packages
 			freetype-devel
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/xorg-x11-fonts/xorg-x11-fonts.nm b/xorg-x11-fonts/xorg-x11-fonts.nm
index 5744b3198..856df62e7 100644
--- a/xorg-x11-fonts/xorg-x11-fonts.nm
+++ b/xorg-x11-fonts/xorg-x11-fonts.nm
@@ -115,7 +115,7 @@ build
 		cp -vf %{DIR_DL}/unifont-5.1.20080820.pcf.gz \
 			%{BUILDROOT}/usr/share/X11/fonts/misc/unifont.pcf.gz
 
-		# XXX Do we need to create these symlinks to use the fonts - check this in a running X environment. 
+		# XXX Do we need to create these symlinks to use the fonts - check this in a running X environment.
 		# Install catalogue symlinks
 		#mkdir -pv %{BUILDROOT}/etc/X11/fontpath.d
 		#ln -svf ../../../usr/share/X11/fonts/100dpi %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-100dpi
@@ -395,9 +395,9 @@ packages
 		description
 			GNU Unifont, contains glyphs for every printable code point in the Unicode 5.1 Basic Multilingual Plane (BMP).
 		end
-	
+
 		files
-			/usr/share/X11/fonts/misc/unifont.pcf.gz	
+			/usr/share/X11/fonts/misc/unifont.pcf.gz
 		end
 	end
 end
diff --git a/xorg-x11-server/xorg-x11-server.nm b/xorg-x11-server/xorg-x11-server.nm
index 5897513a8..7ed9a8b2a 100644
--- a/xorg-x11-server/xorg-x11-server.nm
+++ b/xorg-x11-server/xorg-x11-server.nm
@@ -146,13 +146,17 @@ packages
 			xorg-x11-xkb-utils
 		end
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
-	
+
 		requires
 			libpciaccess-devel
 			pixman-devel
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/xorg-x11-xinit/xorg-x11-xinit.nm b/xorg-x11-xinit/xorg-x11-xinit.nm
index b73bd2dd0..cd8243624 100644
--- a/xorg-x11-xinit/xorg-x11-xinit.nm
+++ b/xorg-x11-xinit/xorg-x11-xinit.nm
@@ -29,4 +29,8 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm b/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm
index 25abfb7c9..c7d194e79 100644
--- a/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm
+++ b/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm
@@ -65,4 +65,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/xrandr/xrandr.nm b/xrandr/xrandr.nm
index 1ce8c6a83..eebec73e8 100644
--- a/xrandr/xrandr.nm
+++ b/xrandr/xrandr.nm
@@ -37,4 +37,8 @@ end
 packages
 	package %{name}
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/xterm/xterm.nm b/xterm/xterm.nm
index 7ed670822..52b824ad6 100644
--- a/xterm/xterm.nm
+++ b/xterm/xterm.nm
@@ -48,4 +48,8 @@ packages
 	package %{name}
 		requires = xorg-x11-server
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/xz/xz.nm b/xz/xz.nm
index 3150feba3..75711a0e3 100644
--- a/xz/xz.nm
+++ b/xz/xz.nm
@@ -84,4 +84,8 @@ packages
 			/usr/lib/lib*.so.0*
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/zerofree/zerofree.nm b/zerofree/zerofree.nm
index dc21ca82c..5820fae33 100644
--- a/zerofree/zerofree.nm
+++ b/zerofree/zerofree.nm
@@ -47,4 +47,8 @@ end
 packages
 	package zerofree
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
diff --git a/zlib/zlib.nm b/zlib/zlib.nm
index a1bafc20c..d65d2f8a7 100644
--- a/zlib/zlib.nm
+++ b/zlib/zlib.nm
@@ -44,8 +44,12 @@ end
 packages
 	package %{name}
 	end
-	
+
 	package %{name}-devel
 		template DEVEL
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end
-- 
2.39.2