diff --git a/ejabberd.init b/ejabberd.init
index 9670916..99552a6 100644
--- a/ejabberd.init
+++ b/ejabberd.init
@@ -32,6 +32,13 @@ start() {
 	if [ "$ULIMIT_MAX_FILES" ]; then
 		ulimit -n $ULIMIT_MAX_FILES
 	fi
+
+	# check whether ejabberd was already started
+	if /usr/sbin/ejabberdctl status > /dev/null 2>&1 ; then
+		echo -n "already running" && warning && echo
+		return 0
+	fi
+
 	daemon /usr/sbin/ejabberdctl start
 				--config $CONFIG_FILE \
 				--ctl-config /etc/ejabberd/ejabberdctl.cfg \
@@ -41,16 +48,31 @@ start() {
         RETVAL=$?
         [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ejabberd
         echo
+
+	# it takes some time to actually start necessary nodes
+	sleep 5
+
         return $RETVAL
 }
 
 stop() {
         # Stop daemons.
         echo -n "Shutting down ejabberd: "
+
+	# check whether ejabberd was already stopped
+	if ! /usr/sbin/ejabberdctl status > /dev/null 2>&1 ; then
+		echo -n "already stopped" && warning && echo
+		return 0
+	fi
+
 	daemon /usr/sbin/ejabberdctl stop 2>/dev/null
         RETVAL=$?
         [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ejabberd
         echo
+
+	# it takes some time to actually stop necessary nodes
+	sleep 5
+
         return $RETVAL
 }
 
diff --git a/ejabberd.spec b/ejabberd.spec
index 3511f21..7029afa 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -12,7 +12,7 @@
 
 Name:           ejabberd
 Version:        2.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -369,6 +369,9 @@ rm -rf %{buildroot}
 %doc doc/yozhikheader.png
 
 %changelog
+* Thu Mar 18 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.3-2
+- Init-script enhancements
+
 * Fri Mar 12 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.3-1
 - Ver. 2.1.3
 - Patches rebased
diff --git a/import.log b/import.log
index 5c635b5..2d53bdd 100644
--- a/import.log
+++ b/import.log
@@ -17,3 +17,4 @@ ejabberd-2_1_1-1_fc12:F-11:ejabberd-2.1.1-1.fc12.src.rpm:1261656564
 ejabberd-2_1_2-1_fc12:F-11:ejabberd-2.1.2-1.fc12.src.rpm:1264423698
 ejabberd-2_1_2-2_fc12:F-11:ejabberd-2.1.2-2.fc12.src.rpm:1264770903
 ejabberd-2_1_3-1_fc12:F-11:ejabberd-2.1.3-1.fc12.src.rpm:1268409828
+ejabberd-2_1_3-2_fc12:F-11:ejabberd-2.1.3-2.fc12.src.rpm:1268908304