diff --git a/openwrt/package/quagga/control/quagga.control b/openwrt/package/quagga/control/quagga.control
deleted file mode 100644
index 904542721be..00000000000
--- a/openwrt/package/quagga/control/quagga.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: quagga-all
-Priority: optional
-Section: net
-Maintainer: Johannes 5 Joemann <joemann@beefree.free.de>
-Source: buildroot internal
-Description: routing software package that provides TCP/IP based routing services with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2, OSPFv3, BGP-4, and BGP-4+ 
diff --git a/openwrt/package/quagga/control/quagga-bgpd.control b/openwrt/package/quagga/ipkg/quagga-bgpd.control
similarity index 59%
rename from openwrt/package/quagga/control/quagga-bgpd.control
rename to openwrt/package/quagga/ipkg/quagga-bgpd.control
index 1b1e80fa252..0c2c401c00c 100644
--- a/openwrt/package/quagga/control/quagga-bgpd.control
+++ b/openwrt/package/quagga/ipkg/quagga-bgpd.control
@@ -3,4 +3,5 @@ Priority: optional
 Section: net
 Maintainer: Johannes 5 Joemann <joemann@beefree.free.de>
 Source: buildroot internal
-Description: bgpd daemon
+Description: A BGPv4, BGPv4\+, BGPv4\- routing engine for use
+ with Quagga routing software
diff --git a/openwrt/package/quagga/ipkg/quagga-ospf6d.control b/openwrt/package/quagga/ipkg/quagga-ospf6d.control
new file mode 100644
index 00000000000..07ecbe3c302
--- /dev/null
+++ b/openwrt/package/quagga/ipkg/quagga-ospf6d.control
@@ -0,0 +1,7 @@
+Package: quagga-ospfd
+Priority: optional
+Section: net
+Maintainer: Johannes 5 Joemann <joemann@beefree.free.de>
+Source: buildroot internal
+Description: An OSPFv3 routing engine for use
+ with Quagga routing software
diff --git a/openwrt/package/quagga/control/quagga-ospfd.control b/openwrt/package/quagga/ipkg/quagga-ospfd.control
similarity index 64%
rename from openwrt/package/quagga/control/quagga-ospfd.control
rename to openwrt/package/quagga/ipkg/quagga-ospfd.control
index 9ebb2bbba10..eeab13acb85 100644
--- a/openwrt/package/quagga/control/quagga-ospfd.control
+++ b/openwrt/package/quagga/ipkg/quagga-ospfd.control
@@ -3,4 +3,5 @@ Priority: optional
 Section: net
 Maintainer: Johannes 5 Joemann <joemann@beefree.free.de>
 Source: buildroot internal
-Description: ospf daemon
+Description: An OSPFv2 routing engine for use
+ with Quagga routing software
diff --git a/openwrt/package/quagga/control/quagga-ripd.control b/openwrt/package/quagga/ipkg/quagga-ripd.control
similarity index 65%
rename from openwrt/package/quagga/control/quagga-ripd.control
rename to openwrt/package/quagga/ipkg/quagga-ripd.control
index eb426081e1e..b9362d907a5 100644
--- a/openwrt/package/quagga/control/quagga-ripd.control
+++ b/openwrt/package/quagga/ipkg/quagga-ripd.control
@@ -3,4 +3,5 @@ Priority: optional
 Section: net
 Maintainer: Johannes 5 Joemann <joemann@beefree.free.de>
 Source: buildroot internal
-Description: rip daemon
+Description: A RIP routing engine for use
+ with Quagga routing software
diff --git a/openwrt/package/quagga/ipkg/quagga-ripngd.control b/openwrt/package/quagga/ipkg/quagga-ripngd.control
new file mode 100644
index 00000000000..aed95e4936e
--- /dev/null
+++ b/openwrt/package/quagga/ipkg/quagga-ripngd.control
@@ -0,0 +1,7 @@
+Package: quagga-ripd
+Priority: optional
+Section: net
+Maintainer: Johannes 5 Joemann <joemann@beefree.free.de>
+Source: buildroot internal
+Description: A RIPNG routing engine for use
+ with Quagga routing software
diff --git a/openwrt/package/quagga/control/quagga-zebra.control b/openwrt/package/quagga/ipkg/quagga-zebra.control
similarity index 65%
rename from openwrt/package/quagga/control/quagga-zebra.control
rename to openwrt/package/quagga/ipkg/quagga-zebra.control
index c948f2f8558..b42fc560938 100644
--- a/openwrt/package/quagga/control/quagga-zebra.control
+++ b/openwrt/package/quagga/ipkg/quagga-zebra.control
@@ -3,4 +3,5 @@ Priority: optional
 Section: net
 Maintainer: Johannes 5 Joemann <joemann@beefree.free.de>
 Source: buildroot internal
-Description: zebra daemon
+Description: A routing manager for use
+ with associated Quagga components
diff --git a/openwrt/package/quagga/ipkg/quagga.control b/openwrt/package/quagga/ipkg/quagga.control
new file mode 100644
index 00000000000..df98871000b
--- /dev/null
+++ b/openwrt/package/quagga/ipkg/quagga.control
@@ -0,0 +1,8 @@
+Package: quagga
+Priority: optional
+Section: net
+Maintainer: Johannes 5 Joemann <joemann@beefree.free.de>
+Source: buildroot internal
+Description: A routing software package that provides TCP/IP
+ based routing services with routing protocols support such
+ as RIPv1, RIPv2, RIPng, OSPFv2, OSPFv3, BGP-4, and BGP-4+.
diff --git a/openwrt/package/quagga/ipkg/CONTROL/postinst b/openwrt/package/quagga/ipkg/quagga.postinst
old mode 100755
new mode 100644
similarity index 100%
rename from openwrt/package/quagga/ipkg/CONTROL/postinst
rename to openwrt/package/quagga/ipkg/quagga.postinst