diff --git a/check_mail_queue b/check_mail_queue
new file mode 100644
index 0000000..a3cd9de
--- /dev/null
+++ b/check_mail_queue
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+nm()
+{
+    NM=$( /usr/bin/mailq 2> /dev/null | tail -1 | /usr/bin/gawk '{ print $5 }' )
+    if [ "$NM" ]
+    then
+        return 0
+    else
+        return 1
+    fi
+}
+
+test -e /var/run/check_mail_queue.pid && exit;
+echo $$ > /var/run/check_mail_queue.pid
+while( nm )
+do
+    /etc/init.d/postfix status || /etc/init.d/postfix start
+    sleep 10
+    /usr/sbin/postfix flush
+done
+/etc/init.d/postfix status && /etc/init.d/postfix stop
+rm /var/run/check_mail_queue.pid
+
diff --git a/postfix.changes b/postfix.changes
index aa79863..2c767ff 100644
--- a/postfix.changes
+++ b/postfix.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Apr  7 12:39:16 UTC 2010 - varkoly@novell.com
+
+- New file check_mail_queue. This script checks if there are some
+  mails in the queue and starts postfix if necessary. After delivering
+  the mails postfix will be stoped. 
+
 -------------------------------------------------------------------
 Thu Apr  1 10:28:09 UTC 2010 - varkoly@novell.com
 
diff --git a/postfix.spec b/postfix.spec
index 8b331d5..8eef2ac 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -22,7 +22,7 @@
 Name:           postfix
 Summary:        A fast, secure, and flexible mailer
 Version:        2.7.0
-Release:        2
+Release:        3
 License:        IBM Public License ..
 Group:          Productivity/Networking/Email/Servers
 Url:            http://www.postfix.org/
@@ -31,6 +31,7 @@ Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}-SuSE.tar.gz
 Source2:        %{name}-mysql.tar.bz2
 Source10:       rpmlintrc
+Source11:       check_mail_queue
 Patch:          dynamic_maps.patch
 Patch1:         dynamic_maps_pie.patch
 Patch2:         pointer_to_literals.patch
@@ -368,6 +369,7 @@ done
 %fdupes $RPM_BUILD_ROOT%{_mandir}
 %endif
 # ---------------------------------------------------------------------------
+install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/sbin/
 
 %pre
 VERSIONTEST=$(test -x usr/sbin/postconf && usr/sbin/postconf proxy_read_maps 2>/dev/null)
@@ -543,6 +545,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/sbin/smtp-sink
 /usr/sbin/smtp-source
 /usr/sbin/mk%{name}cert
+/usr/sbin/check_mail_queue
 /sbin/rc%{name}
 %{_libdir}/lib*
 /usr/lib/sendmail