diff --git a/sm5/Makefile.am b/sm5/Makefile.am
index 74b950c68958226303e1858fec0abe69bedcd12c..01081de7e6cf5536ea98d09ffe316716b1974871 100644
--- a/sm5/Makefile.am
+++ b/sm5/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 #
-# $Id: Makefile.am,v 1.93 2009/01/12 22:55:02 dlukes Exp $
+# $Id: Makefile.am,v 1.94 2009/01/12 23:57:58 dlukes Exp $
 #
 
 @SET_MAKE@
@@ -302,6 +302,7 @@ smartd.conf.5.in: smartd.8.in
 	cat $(top_builddir)/tmp.tail >> $(srcdir)/smartd.conf.5.in
 	rm -f $(top_builddir)/tmp.head $(top_builddir)/tmp.tail $(top_builddir)/tmp.directives
 
+if INSTALL_INITSCRIPT
 if OS_DARWIN
 initd_DATA = SMART                            \
 	os_darwin/StartupParameters.plist     \
@@ -310,6 +311,7 @@ initd_DATA = SMART                            \
 initd_install_name = SMART
 
 initd_DATA_install = install-initdDATA-darwin
+initd_DATA_uninstall = uninstall-initdDATA-darwin
 
 SMART : os_darwin/SMART.in
 	sed "s|/usr/sbin/|$(sbindir)/|" $< > $@
@@ -335,6 +337,9 @@ install-initdDATA-darwin: $(initd_DATA)
 	@echo -e "#   to learn about it. A sample configuration file can be found in:\n#   ${docdir}\n#"
 	@echo -e "####################################################################\n\n"
 
+uninstall-initdDATA-darwin:
+	rm -rf $(DESTDIR)$(initddir)/$(initd_install_name)
+
 else
 
 initd_DATA = smartd.initd
@@ -345,6 +350,7 @@ smartd.initd: $(srcdir)/smartd.initd.in Makefile
 initd_install_name = smartd$(smartd_suffix)
 
 initd_DATA_install = install-initdDATA-generic
+initd_DATA_uninstall = uninstall-initdDATA-generic
 
 install-initdDATA-generic: $(initd_DATA)
 	$(mkinstalldirs) $(DESTDIR)$(initddir)
@@ -357,12 +363,22 @@ install-initdDATA-generic: $(initd_DATA)
 	@echo -e "#   to learn about it. A sample configuration file can be found in:\n#   ${docdir}\n#"
 	@echo -e "####################################################################\n\n"
 
+
+uninstall-initdDATA-generic:
+	rm -rf $(DESTDIR)$(initddir)/$(initd_install_name)
+endif
+else
+
+initd_DATA_install = install-initdDATA-null
+initd_DATA_uninstall = uninstall-initdDATA-null
+
+install-initdDATA-null:
+uninstall-initdDATA-null:
 endif
 
 install-initdDATA : $(initd_DATA_install)
 
-uninstall-initdDATA:
-	rm -rf $(DESTDIR)$(initddir)/$(initd_install_name)
+uninstall-initdDATA: $(initd_DATA_uninstall)
 
 uninstall-docsDATA:
 	rm -rf $(DESTDIR)$(docsdir)
diff --git a/sm5/configure.in b/sm5/configure.in
index 4e280887d67ce7db2c95e2b010b89ccb15d01879..71e6996dc9fa2c73ff88cf88c6d7c8336f472bfd 100644
--- a/sm5/configure.in
+++ b/sm5/configure.in
@@ -1,5 +1,5 @@
 #
-# $Id: configure.in,v 1.146 2009/01/12 22:55:02 dlukes Exp $
+# $Id: configure.in,v 1.147 2009/01/12 23:57:58 dlukes Exp $
 #
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.50)
@@ -7,7 +7,7 @@ AC_INIT(smartmontools, 5.39, smartmontools-support@lists.sourceforge.net)
 AC_CONFIG_SRCDIR(smartctl.cpp)
 
 smartmontools_configure_date=`date -u +"%Y/%m/%d %T %Z"`
-smartmontools_cvs_tag=`echo '$Id: configure.in,v 1.146 2009/01/12 22:55:02 dlukes Exp $'`
+smartmontools_cvs_tag=`echo '$Id: configure.in,v 1.147 2009/01/12 23:57:58 dlukes Exp $'`
 smartmontools_release_date=2008/03/10
 smartmontools_release_time="10:44:07 GMT"
 
@@ -135,6 +135,7 @@ AC_SUBST([exampledir], ['${docdir}/examplescripts'])
 
 AC_ARG_WITH(initscriptdir,[AC_HELP_STRING([--with-initscriptdir=dir],[Location of init scripts (default is ${sysconfdir}/rc.d/init.d)])],[initddir="$withval"],[initddir='${sysconfdir}/rc.d/init.d'])
 AC_SUBST(initddir)
+AM_CONDITIONAL(INSTALL_INITSCRIPT, [test "$with_initscriptdir" != "no"])
 
 AC_ARG_WITH(docdir,[AC_HELP_STRING([--with-docdir=dir],[Location of documentation (default is ${prefix}/share/doc/smartmontools-5.X)])],[docdir="$withval"],[docdir='${prefix}/share/doc/${PACKAGE}-${VERSION}'])
 AC_SUBST(docdir)