diff --git a/msmtp-1.4.22.tar.bz2 b/msmtp-1.4.22.tar.bz2
deleted file mode 100644
index ae37611..0000000
--- a/msmtp-1.4.22.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7aa6d8cddf7a0210eb8c69608bf3595dae28f82cabec4e03d309fe486531c74e
-size 942285
diff --git a/msmtp-1.4.24.tar.bz2 b/msmtp-1.4.24.tar.bz2
new file mode 100644
index 0000000..c29b1d7
--- /dev/null
+++ b/msmtp-1.4.24.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f19f3fcc67da448420b3adbd5add09f8fe110664dd64f3c2cd693ef0cb736887
+size 299358
diff --git a/msmtp.changes b/msmtp.changes
index 499e03e..e96a371 100644
--- a/msmtp.changes
+++ b/msmtp.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Sep 19 08:37:21 UTC 2011 - wr@rosenauer.org
+
+- update to version 1.4.24
+  - fixes SCRAM-SHA-1 authentication via GNU SASL
+  - cleanup that updates the build system and removes old cruft
+    and unnecessary complexity, without changing the functionality
+    of the program
+- spec cleanup
+
 -------------------------------------------------------------------
 Mon Jan 10 14:24:09 UTC 2011 - gber@opensuse.org
 
diff --git a/msmtp.spec b/msmtp.spec
index 7eadf96..1ddc101 100644
--- a/msmtp.spec
+++ b/msmtp.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package msmtp (Version 1.4.22)
+# spec file for package msmtp
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,18 +15,16 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           msmtp
-Version:        1.4.22
-Release:        2
-#
+Version:        1.4.24
+Release:        1
 License:        GPLv3+
 Group:          Productivity/Networking/Email/Utilities
-#
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  libidn-devel openssl-devel
+BuildRequires:  libidn-devel
+BuildRequires:  openssl-devel
+BuildRequires:  pkg-config
 %if 0%{?suse_version} >= 1120
 BuildRequires:  libgsasl-devel
 %endif
@@ -52,25 +50,17 @@ PreReq:         %install_info_prereq
 Requires(post): /sbin/install-info
 Requires(preun):/sbin/install-info
 %endif
-#
+#Patch0:         msmtp-fix-newopenssl.patch
+Summary:        Lightweight SMTP Client
 Url:            http://msmtp.sourceforge.net/
 Source:         http://prdownloads.sourceforge.net/msmtp/msmtp-%{version}.tar.bz2
-#Patch0:         msmtp-fix-newopenssl.patch
-#
-Summary:        Lightweight SMTP Client
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 msmtp is an SMTP client that can be used as a plug-in for Mutt and
 other mail user agents.  It forwards mail to an SMTP server that does
 the delivery.  msmtp supports multiple accounts.
 
-
-
-
-Authors:
---------
-    Martin Lambers <marlam@marlam.de>
-
 %package doc
 License:        GPLv3+
 Summary:        Documentation for %{name}
@@ -93,23 +83,23 @@ examples and sample configuration files.
 export CFLAGS="%{optflags} -fstack-protector"
 %endif
 %configure --docdir="%{_docdir}/%{name}" --with-ssl=openssl
-%__make %{?jobs:-j%{jobs}}
+make %{?_smp_mflags}
 
 %install
 %makeinstall
 %find_lang %{name}
 for i in README ChangeLog ; do
-    %{__cp} scripts/msmtpqueue/$i ${i}.msmtpqueue
+    cp scripts/msmtpqueue/$i ${i}.msmtpqueue
 done
-%{__cp} scripts/msmtpq/README README.msmtpq
-%{__cp} scripts/vim/README    README.vim
-%{__install} -m 0755 \
+cp scripts/msmtpq/README README.msmtpq
+cp scripts/vim/README    README.vim
+install -m 0755 \
         scripts/msmtpqueue/*.sh \
         scripts/msmtpq/msmtp{q,Q} \
         scripts/set_sendmail/*.sh \
         scripts/find_alias/*.sh \
     %{buildroot}%{_bindir}
-%{__install} -D -m 0644 \
+install -D -m 0644 \
       scripts/vim/msmtp.vim \
       %{buildroot}%{_datadir}/vim/current/syntax/msmtp.vim
 
@@ -117,26 +107,23 @@ done
 for f in \
 COPYING\
 ; do
-    %__install -D -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/$f"
+    install -D -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/$f"
 done
 
 # doc files
 echo -n >docfiles.lst
 for f in \
 AUTHORS ChangeLog* NEWS README README.msmtpqueue README.msmtpq THANKS \
-doc/msmtp.html doc/Mutt+msmtp.txt doc/*.example \
+doc/Mutt+msmtp.txt doc/*.example \
 scripts/set_sendmail/set_sendmail.conf \
 ; do
     ff="${f##*/}"
-    %__install -D -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/$ff"
+    install -D -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/$ff"
     echo "%doc %{_docdir}/%{name}/$ff" >>docfiles.lst
 done
 
 # not properly ignored on Fedora 10:
-%__rm -f "%{buildroot}%{_infodir}/dir"
-
-%clean
-%{__rm} -rf %{buildroot}
+rm -f "%{buildroot}%{_infodir}/dir"
 
 %if 0%{?suse_version}