diff --git a/solaris/prototype.doc.in b/solaris/prototype.doc.in
index 8cbb8937f4..42b076d0ec 100644
--- a/solaris/prototype.doc.in
+++ b/solaris/prototype.doc.in
@@ -2,7 +2,7 @@ i pkginfo=$abs_builddir/pkginfo.doc.full
 i depend=$abs_builddir/depend.doc
 i copying=$abs_top_srcdir/COPYING
 d none @infodir@=$DESTDIR/@infodir@ 0755 root bin
-f none @infodir@/dir=$DESTDIR/@infodir@/dir 0644 root bin
+#f none @infodir@/dir=$DESTDIR/@infodir@/dir 0644 root bin
 f none @infodir@/quagga.info=$DESTDIR/@infodir@/quagga.info 0644 root bin
 d none @mandir@=$DESTDIR/@mandir@ 0755 root bin
 d none @mandir@/man1=$DESTDIR/@mandir@/man1 0755 root bin
diff --git a/solaris/quagga.xml.in b/solaris/quagga.xml.in
index 95aa009b1b..71a43016fe 100644
--- a/solaris/quagga.xml.in
+++ b/solaris/quagga.xml.in
@@ -111,13 +111,6 @@
 			now define it's own dependencies/properties etc here, it'll
 			inherit the rest...
 		-->
-		<property_group name='quagga' type='application'>
-			<stability value='Evolving' />
-			<propval name='daemon_name' type='astring'
-				value='bgpd'/>
-			<propval name='daemon_name' type='boolean'
-				value='false'/>
-		</property_group>
 		<dependency name='zebra'
 			grouping='require_all'
 			restart_on='restart'
@@ -131,6 +124,13 @@
 			<service_fmri
 			    value='file://localhost/@sysconfdir@/bgpd.conf' />
 		</dependency>
+		<property_group name='quagga' type='application'>
+			<stability value='Evolving' />
+			<propval name='daemon_name' type='astring'
+				value='bgpd'/>
+			<propval name='daemon_name' type='boolean'
+				value='false'/>
+		</property_group>
 		<template>
 			<common_name>
 				<loctext xml:lang='C'>
@@ -152,11 +152,6 @@
 			now define it's own dependencies/properties etc here, it'll
 			inherit the rest...
 		-->
-		<property_group name='quagga' type='application'>
-			<stability value='Evolving' />
-			<propval name='daemon_name' type='astring'
-				value='ospf6d'/>
-		</property_group>
 		<dependency name='zebra'
 			grouping='require_all'
 			restart_on='restart'
@@ -170,6 +165,11 @@
 			<service_fmri
 			    value='file://localhost/@sysconfdir@/ospf6d.conf' />
 		</dependency>
+		<property_group name='quagga' type='application'>
+			<stability value='Evolving' />
+			<propval name='daemon_name' type='astring'
+				value='ospf6d'/>
+		</property_group>
 		<template>
 			<common_name>
 				<loctext xml:lang='C'>
@@ -191,11 +191,6 @@
 			now define it's own dependencies/properties etc here, it'll
 			inherit the rest...
 		-->
-		<property_group name='quagga' type='application'>
-			<stability value='Evolving' />
-			<propval name='daemon_name' type='astring'
-				value='ospfd'/>
-		</property_group>
 		<dependency name='zebra'
 			grouping='require_all'
 			restart_on='restart'
@@ -213,6 +208,11 @@
 			<stability value='Evolving' />
 			<propval name='retain_routes' type='boolean' value='false'/>
 		</property_group>
+		<property_group name='quagga' type='application'>
+			<stability value='Evolving' />
+			<propval name='daemon_name' type='astring'
+				value='ospfd'/>
+		</property_group>
 		<template>
 			<common_name>
 				<loctext xml:lang='C'>
@@ -234,11 +234,6 @@
 			now define it's own dependencies/properties etc here, it'll
 			inherit the rest...
 		-->
-		<property_group name='quagga' type='application'>
-			<stability value='Evolving' />
-			<propval name='daemon_name' type='astring'
-				value='ripd'/>
-		</property_group>
 		<dependency name='zebra'
 			grouping='require_all'
 			restart_on='restart'
@@ -256,6 +251,11 @@
 			<stability value='Evolving' />
 			<propval name='retain_routes' type='boolean' value='false'/>
 		</property_group>
+		<property_group name='quagga' type='application'>
+			<stability value='Evolving' />
+			<propval name='daemon_name' type='astring'
+				value='ripd'/>
+		</property_group>
 		<template>
 			<common_name>
 				<loctext xml:lang='C'>
@@ -277,11 +277,6 @@
 			now define it's own dependencies/properties etc here, it'll
 			inherit the rest...
 		-->
-		<property_group name='quagga' type='application'>
-			<stability value='Evolving' />
-			<propval name='daemon_name' type='astring'
-				value='ripngd'/>
-		</property_group>
 		<dependency name='zebra'
 			grouping='require_all'
 			restart_on='restart'
@@ -299,6 +294,11 @@
 			<stability value='Evolving' />
 			<propval name='retain_routes' type='boolean' value='false'/>
 		</property_group>
+		<property_group name='quagga' type='application'>
+			<stability value='Evolving' />
+			<propval name='daemon_name' type='astring'
+				value='ripngd'/>
+		</property_group>
 		<template>
 			<common_name>
 				<loctext xml:lang='C'>