diff --git a/solaris/ChangeLog b/solaris/ChangeLog
index b7c78d1..2f413f5 100644
--- a/solaris/ChangeLog
+++ b/solaris/ChangeLog
@@ -3,6 +3,12 @@
 	* quagga.xml.in: Sigh, XML child elements are order-sensitive.
 	* prototype.doc.in: info/dir doesnt get created always.. comment
 	  out for now, likely needs to be done with an install method.
+	* prototype.daemons.in: Move the Solaris 10 SMF specific stuff to
+	  a seperate package.
+	* depend.smf: dependencies for smf package
+	* pkginfo.smf.tmpl.in: pkginfo for smf
+	* prototype.smf.in: prototype for smf
+	* Makefile.am: Add smf to pkg_names
 	  
 2005-04-26 Paul Jakma <paul.jakma@sun.com>
 
diff --git a/solaris/Makefile.am b/solaris/Makefile.am
index 9fc6311..82da314 100644
--- a/solaris/Makefile.am
+++ b/solaris/Makefile.am
@@ -1,11 +1,11 @@
 # Solaris packages automake file
-# $Id: Makefile.am,v 1.5 2005/04/26 02:35:03 paul Exp $
+# $Id: Makefile.am,v 1.6 2005/05/13 07:26:07 paul Exp $
 
 .PHONY: packages
 
 # the names of the various subpackages, and some convenient 
 # derived variables.
-pkg_names = daemons dev doc libs
+pkg_names = daemons dev doc libs smf
 pkg_quagga_daemons = zebra bgpd ospfd ospf6d ripd ripngd
 pkg_name_rev = @PACKAGE_VERSION@-@CONFDATE@-@target_os@-@target_cpu@
 pkg_depends := $(pkg_names:%=depend.%)
diff --git a/solaris/depend.smf b/solaris/depend.smf
new file mode 100644
index 0000000..d648708
--- /dev/null
+++ b/solaris/depend.smf
@@ -0,0 +1,6 @@
+P QUAGGAdaemons Quagga daemons
+P SUNWcsu Core Solaris, (Usr)
+P SUNWcsr Core Solaris Libraries (Root)
+I SUNWzebrar
+I SUNWzebrau
+I CSWzebra
diff --git a/solaris/pkginfo.smf.tmpl.in b/solaris/pkginfo.smf.tmpl.in
new file mode 100644
index 0000000..4aa0393
--- /dev/null
+++ b/solaris/pkginfo.smf.tmpl.in
@@ -0,0 +1,2 @@
+PKG="QUAGGAsmf"
+NAME="@PACKAGE_NAME@ - @PACKAGE_NAME@ SMF support"
diff --git a/solaris/prototype.daemons.in b/solaris/prototype.daemons.in
index b5753be..ce65d5e 100644
--- a/solaris/prototype.daemons.in
+++ b/solaris/prototype.daemons.in
@@ -1,8 +1,6 @@
 i pkginfo=$abs_builddir/pkginfo.daemons.full
 i depend=$abs_builddir/depend.daemons
 i copying=$abs_top_srcdir/COPYING
-i i.manifest
-i r.manifest
 d none @sbindir@=$DESTDIR/@sbindir@ 0755 root bin
 f none @sbindir@/zebra=$DESTDIR/@sbindir@/zebra 0755 root bin
 f none @sbindir@/bgpd=$DESTDIR/@sbindir@/bgpd 0755 root bin
@@ -20,6 +18,3 @@
 f none @sysconfdir@/ospfd.conf.sample=$DESTDIR/@sysconfdir@/ospfd.conf.sample 0644 root bin
 f none @sysconfdir@/ospf6d.conf.sample=$DESTDIR/@sysconfdir@/ospf6d.conf.sample 0644 root bin
 d none @quagga_statedir@=$DESTDIR/@quagga_statedir@ 0711 @enable_user@ @enable_group@
-f manifest var/svc/manifest/network/quagga.xml 0444 root bin
-#f none var/svc/profile/@PACKAGE_TARNAME@_options.xml=$abs_builddir/options.xml 0755 root sys
-f none lib/svc/method/quagga=$abs_builddir/quagga.init 0755 root bin
diff --git a/solaris/prototype.smf.in b/solaris/prototype.smf.in
new file mode 100644
index 0000000..3c80f39
--- /dev/null
+++ b/solaris/prototype.smf.in
@@ -0,0 +1,8 @@
+i pkginfo=$abs_builddir/pkginfo.smf.full
+i depend=$abs_builddir/depend.smf
+i copying=$abs_top_srcdir/COPYING
+i i.manifest
+i r.manifest
+f manifest var/svc/manifest/network/quagga.xml 0444 root bin
+#f none var/svc/profile/@PACKAGE_TARNAME@_options.xml=$abs_builddir/options.xml 0755 root sys
+f none lib/svc/method/quagga=$abs_builddir/quagga.init 0755 root bin