diff --git a/msmtp-1.4.12.tar.bz2 b/msmtp-1.4.12.tar.bz2
new file mode 100644
index 0000000..ea1cf60
--- /dev/null
+++ b/msmtp-1.4.12.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab794bb014cdaeae0a1460a7aca1869dab8c93383bf01f41aca41b3d99b69509
+size 543214
diff --git a/msmtp-1.4.7.tar.bz2 b/msmtp-1.4.7.tar.bz2
deleted file mode 100644
index 2e1fbfb..0000000
--- a/msmtp-1.4.7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e795dc62a98c9e83ecaea3d1dde074156228cf55eff42f8dbfd835cabad28d89
-size 527853
diff --git a/msmtp.changes b/msmtp.changes
index 728558d..6393404 100644
--- a/msmtp.changes
+++ b/msmtp.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Jun 17 10:21:08 CEST 2007 - bwalle@suse.de
+
+- update to version 1.4.12:
+  o Handle MAILER-DAEMON correctly
+  o documentation updates
+  o Require tls_trust_file or tls_certcheck=off for TLS sessions
+  o Do not use NTLM authentication automatically
+  o Gnulib update
+  o bug fixes
+- update to msmtpqueue 0.5:
+  o Added the msmtp-listqueue.sh script
+
 -------------------------------------------------------------------
 Mon Aug 21 03:59:11 CEST 2006 - mrueckert@suse.de
 
diff --git a/msmtp.spec b/msmtp.spec
index 334a86c..99fc2ee 100644
--- a/msmtp.spec
+++ b/msmtp.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package msmtp (Version 1.4.7)
+# spec file for package msmtp (Version 1.4.12)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -11,10 +11,11 @@
 # norootforbuild
 
 Name:           msmtp
-Version:        1.4.7
+%define msmtpqueue_version      0.5
+Version:        1.4.12
 Release:        1
 #
-License:        GNU General Public License (GPL) - all versions
+License:        GNU General Public License (GPL)
 Group:          Productivity/Networking/Email/Utilities
 #
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -25,7 +26,7 @@ PreReq:         %install_info_prereq
 #
 URL:            http://msmtp.sourceforge.net/
 Source:         http://prdownloads.sourceforge.net/msmtp/msmtp-%{version}.tar.bz2
-Source1:        http://prdownloads.sourceforge.net/msmtp/msmtpqueue-0.4.tar.gz
+Source1:        http://prdownloads.sourceforge.net/msmtp/msmtpqueue-%{msmtpqueue_version}.tar.bz2
 #
 Summary:        An SMTP Client
 
@@ -54,9 +55,9 @@ export CFLAGS="%{optflags} -fstack-protector"
 %makeinstall
 %find_lang %{name}
 for i in README ChangeLog ; do
-    %{__cp} msmtpqueue-0.4/$i ${i}.msmtpqueue
+    %{__cp} msmtpqueue-%{msmtpqueue_version}/$i ${i}.msmtpqueue
 done
-%{__install} -D -m 0755 msmtpqueue-0.4/*.sh %{buildroot}%{_bindir}
+%{__install} -D -m 0755 msmtpqueue-%{msmtpqueue_version}/*.sh %{buildroot}%{_bindir}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -74,12 +75,23 @@ done
 %doc AUTHORS ChangeLog* COPYING NEWS README* THANKS
 %doc doc/msmtp.html doc/Mutt+msmtp.txt doc/*.example
 %{_bindir}/msmtp
+%{_bindir}/msmtp-listqueue.sh
 %{_bindir}/msmtp-enqueue.sh
 %{_bindir}/msmtp-runqueue.sh
 %{_mandir}/man1/msmtp.1*
 %{_infodir}/msmtp.info*
 
-%changelog -n msmtp
+%changelog
+* Sun Jun 17 2007 - bwalle@suse.de
+- update to version 1.4.12:
+  o Handle MAILER-DAEMON correctly
+  o documentation updates
+  o Require tls_trust_file or tls_certcheck=off for TLS sessions
+  o Do not use NTLM authentication automatically
+  o Gnulib update
+  o bug fixes
+- update to msmtpqueue 0.5:
+  o Added the msmtp-listqueue.sh script
 * Mon Aug 21 2006 - mrueckert@suse.de
 - Update to version 1.4.7:
   o added option to enforce SSLv3
diff --git a/msmtpqueue-0.4.tar.gz b/msmtpqueue-0.4.tar.gz
deleted file mode 100644
index ab9dcd3..0000000
--- a/msmtpqueue-0.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c1453a3ad8c7893b2d67c0315c0264993f4dff1708352171c0408096869da6ed
-size 2351
diff --git a/msmtpqueue-0.5.tar.bz2 b/msmtpqueue-0.5.tar.bz2
new file mode 100644
index 0000000..0345454
--- /dev/null
+++ b/msmtpqueue-0.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff223ec57488205dec60d770372754d9abc02a7171fdc186039efc03f5bf66cf
+size 2468