diff --git a/gammu-1.30.0.tar.bz2 b/gammu-1.30.0.tar.bz2
deleted file mode 100644
index 908567b..0000000
--- a/gammu-1.30.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5918fe10502aef36ab474b4ae44545cd0a7433499b5e29b703ffecb99a7496ae
-size 6230340
diff --git a/gammu-1.31.0.tar.bz2 b/gammu-1.31.0.tar.bz2
new file mode 100644
index 0000000..81e6520
--- /dev/null
+++ b/gammu-1.31.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:623286e06c8faad391c26786adac87f9e620b5a09781c61ecca37afea46ac7cf
+size 6326580
diff --git a/gammu.changes b/gammu.changes
index abe5329..b517380 100644
--- a/gammu.changes
+++ b/gammu.changes
@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Fri Dec 23 18:45:46 UTC 2011 - asterios.dramis@gmail.com
+
+- Updated to 1.31.0:
+  * Fixed compilation with latest libusb.
+  * Improved error handling in SQL backend of SMSD.
+  * SMSD documentation improvements.
+  * Indonesian translation updates.
+  From 1.30.92:
+  * Improved vCard parser to better handle location for various fields, thanks
+    to Vladimir Serbinenko for initial patch.
+  * Fixed reading calls from some Nokia phones (bug #1553).
+  * Improved text mode SMS parsing in AT driver, thanks to Vladimir Serbinenko.
+  * Use glib's MD5 implementation if available.
+  From 1.30.91:
+  * Improved documentation for configuring Gammu.
+  * Fixed parsing birthday from vCard in some cases.
+  * Added option not to use configured logging in SMSD inject and monitor (bug
+    #1539).
+  * Added SMSD configuration LogFacility (bug #1539).
+  * Fixed reading of data from OBEX phones (LP#891803).
+  * Fixed double reply detection (bug #1544).
+  * Increase maximal number of caller groups (bug #1541).
+  * Cancel all calls on maketerminated call if we don't get call ID.
+  * Fixed SMSC handling in some cases in SMSD (bug #1547).
+  From 1.30.90:
+  * Various documentation improvements.
+  * Detect Alcatel style reply on CPIN response (bug #1502).
+  * Fix build on some Win32 systems (bug #1496).
+  * Make jadmaker handle names with spaces (Raphaël Droz).
+  * Display 8-bit messages in hex (Nicolas Pitre).
+  * Do not use AT+CUSD=2 on some phones (bug #1508).
+  * Fixed gammu-monitor with Windows service (bug #1515).
+  * Cleanup of contrib directory.
+  * Better support for Samsung AT phones (bug #1513).
+  * Fixed handling of MMS notification SMSes (bug #1530).
+  * Fixed CPIN reply handling (bug #1532).
+  * SMSD checks for PIN status just after connect (bug #1532).
+  * Fixed various MSVC compilation issues.
+
 -------------------------------------------------------------------
 Sat Jul 23 19:06:35 UTC 2011 - asterios.dramis@gmail.com
 
diff --git a/gammu.spec b/gammu.spec
index 80ad0ca..a8dcbd8 100644
--- a/gammu.spec
+++ b/gammu.spec
@@ -15,33 +15,26 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           gammu
-Version:        1.30.0
-Release:        1
+Version:        1.31.0
+Release:        0
 Summary:        Mobile phone management utility
-
-License:        GPLv2
-Url:            http://wammu.eu/gammu/
+License:        GPL-2.0
 Group:          Productivity/Telephony/Utilities
+Url:            http://wammu.eu/gammu/
 Source0:        http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 # PATCH-FIX-OPENSUSE gammu-smsd.lsb.patch asterios.dramis@gmail.com -- Fix rpmlint warnings "unknown-lsb-keyword" and "init-script-runlevel-4"
 Patch0:         gammu-smsd.lsb.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
 # Python location
 %{!?__python: %define __python python}
 %define g_python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 %define g_python_major_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0][:3]')
-
 # Docdir
 %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel}
 %define gammu_docdir %{_docdir}/%{name}-%{version}
 %else
 %define gammu_docdir %{_docdir}/%{name}
 %endif
-
 # Detect build requires
 # SUSE
 %if 0%{?suse_version}
@@ -52,22 +45,19 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %else
 # Mandriva
 %if 0%{?mandriva_version}
-%define dist_usb_libs libusb1.0-devel
-%define dist_dbi_libs libdbi-devel libdbi-drivers-dbd-sqlite3 sqlite3-tools
 # 64-bit Mandriva has 64 in package name
 %ifarch x86_64
 %define mandriva_hack 64
 %endif
-# Bluetooth things got renamed several times
-%if 0%{?mandriva_version} > 2007
+%if 0%{?mandriva_version} > 200910
+%define dist_usb_libs lib%{?mandriva_hack}usb1.0-devel
+%else
+%define dist_usb_libs lib%{?mandriva_hack}usb-devel
+%endif
+%if 0%{?mandriva_version} > 2010
+%define dist_dbi_libs lib%{?mandriva_hack}dbi-devel libdbi-drivers-dbd-sqlite3 sqlite3-tools
+%endif
 %define dist_bluez_libs lib%{?mandriva_hack}bluez-devel
-%else
-%if 0%{?mandriva_version} > 2006
-%define dist_bluez_libs lib%{?mandriva_hack}bluez2-devel
-%else
-%define dist_bluez_libs libbluez1-devel >= 2.0
-%endif
-%endif
 # postgresql-devel does not work for whatever reason in buildservice
 %if 0%{?mandriva_version} == 2009
 %define dist_postgres_libs postgresql8.3-devel
@@ -82,7 +72,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define dist_bluez_libs bluez-libs-devel >= 2.0
 %define dist_postgres_libs postgresql-devel
 %else
-#Defaults for not known distributions
+# Defaults for not known distributions
 %define dist_usb_libs libusb1-devel
 %define dist_dbi_libs libdbi-devel libdbi-dbd-sqlite sqlite
 %define dist_bluez_libs bluez-libs-devel >= 2.0
@@ -99,9 +89,20 @@ BuildRequires:  curl-devel
 %else
 BuildRequires:  libcurl-devel
 %endif
+%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel}
+BuildRequires:  libgudev1-devel
+%else
+%if 0%{?mandriva_version}
+%ifarch x86_64
+%define mandriva_hack 64
+%endif
+BuildRequires:  lib%{?mandriva_hack}gudev1.0-devel
+%else
 %if 0%{?suse_version} > 1110
 BuildRequires:  libgudev-1_0-devel
 %endif
+%endif
+%endif
 BuildRequires:  mysql-devel
 %if 0%{?suse_version}
 BuildRequires:  pkg-config
@@ -111,13 +112,14 @@ BuildRequires:  pkgconfig
 BuildRequires:  python-devel
 BuildRequires:  unixODBC-devel
 BuildRequires:  %{dist_bluez_libs}
-%if 0%{?suse_version} > 1130
+%if 0%{?suse_version} > 1130 || 0%{?mandriva_version} > 2010 || 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel}
 BuildRequires:  %{dist_dbi_libs}
 %endif
 BuildRequires:  %{dist_postgres_libs}
 BuildRequires:  %{dist_usb_libs}
 Requires:       bluez
 Requires:       dialog
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Gammu is command line utility and library to work with mobile phones
@@ -139,7 +141,6 @@ This package contains Gammu binary as well as some examples.
 
 %package devel
 Summary:        Development files for Gammu
-License:        GPLv2
 Group:          Development/Libraries/C and C++
 %if 0%{?suse_version}
 Requires:       pkg-config
@@ -168,7 +169,6 @@ This package contain files needed for development.
 
 %package smsd
 Summary:        SMS message daemon
-License:        GPLv2
 Group:          Hardware/Mobile
 %if 0%{?suse_version}
 Requires(post): %insserv_prereq %fillup_prereq
@@ -197,12 +197,11 @@ Currently supported phones include:
 * OBEX and IrMC capable phones (Sony-Ericsson, Motorola).
 * Symbian phones through gnapplet.
 
-This package contains Gammu SMS Daemon and tool to inject messages
+This package contains the Gammu SMS Daemon and tool to inject messages
 into the queue.
 
 %package -n libGammu7
 Summary:        Mobile phone management library
-License:        GPLv2
 Group:          System/Libraries
 
 %description -n libGammu7
@@ -221,11 +220,10 @@ Currently supported phones include:
 * OBEX and IrMC capable phones (Sony-Ericsson, Motorola).
 * Symbian phones through gnapplet.
 
-This package contains Gammu shared library.
+This package contains the Gammu shared library.
 
 %package -n libgsmsd7
 Summary:        SMS daemon helper library
-License:        GPLv2
 Group:          System/Libraries
 
 %description -n libgsmsd7
@@ -244,17 +242,14 @@ Currently supported phones include:
 * OBEX and IrMC capable phones (Sony-Ericsson, Motorola).
 * Symbian phones through gnapplet.
 
-This package contains Gammu SMS daemon shared library.
+This package contains the Gammu SMS daemon shared library.
 
 %package -n python-gammu
 Summary:        Python module to communicate with mobile phones
-License:        GPLv2
 Group:          Development/Languages/Python
 Requires:       python >= %{g_python_major_version}
 Requires:       python < %{g_python_major_version}.99
-%if 0%{?suse_version} < 1130
 %{?py_requires}
-%endif
 
 %description -n python-gammu
 This provides gammu module, that can work with any phone Gammu
@@ -309,10 +304,10 @@ mkdir -p %{buildroot}%{_sbindir}
 ln -sf ../../etc/init.d/gammu-smsd %{buildroot}%{_sbindir}/rcgammu-smsd
 
 # Install config file
-install -p -m 0644 docs/config/smsdrc %{buildroot}%{_sysconfdir}/gammu-smsdrc
+install -pm 0644 docs/config/smsdrc %{buildroot}%{_sysconfdir}/gammu-smsdrc
 
 # Install additional doc files
-install -p -m 0644 AUTHORS README.cs README.de README.en_GB README.es README.id README.pt_BR %{buildroot}%{gammu_docdir}/
+install -pm 0644 AUTHORS README.cs README.da README.de README.en_GB README.es README.id README.pl README.pt_BR %{buildroot}%{gammu_docdir}/
 
 # Remove unneeded locales
 %if 0%{?suse_version} && 0%{?suse_version} < 1140
@@ -322,9 +317,6 @@ rm -rf %{buildroot}%{_datadir}/locale/sw/
 %find_lang %{name}
 %find_lang libgammu
 
-%clean
-rm -rf %{buildroot}
-
 %post smsd
 %if 0%{?mandriva_version}
 %_post_service gammu-smsd
@@ -351,6 +343,7 @@ fi
 %endif
 
 %if 0%{?suse_version}
+
 %postun smsd
 %restart_on_update gammu-smsd
 %insserv_cleanup
@@ -373,13 +366,13 @@ fi
 %{_bindir}/jadmaker
 %doc %{gammu_docdir}
 %{_datadir}/gammu/
-%doc %{_mandir}/man1/gammu-config.1%{ext_man}
-%doc %{_mandir}/man1/gammu-detect.1%{ext_man}
-%doc %{_mandir}/man1/gammu.1%{ext_man}
-%doc %{_mandir}/man1/jadmaker.1%{ext_man}
-%doc %{_mandir}/man5/gammu-backup.5%{ext_man}
-%doc %{_mandir}/man5/gammu-smsbackup.5%{ext_man}
-%doc %{_mandir}/man5/gammurc.5%{ext_man}
+%doc %{_mandir}/man1/gammu-config.1*
+%doc %{_mandir}/man1/gammu-detect.1*
+%doc %{_mandir}/man1/gammu.1*
+%doc %{_mandir}/man1/jadmaker.1*
+%doc %{_mandir}/man5/gammu-backup.5*
+%doc %{_mandir}/man5/gammu-smsbackup.5*
+%doc %{_mandir}/man5/gammurc.5*
 
 %files devel
 %defattr(-,root,root,-)
@@ -396,19 +389,19 @@ fi
 %{_bindir}/gammu-smsd-inject
 %{_bindir}/gammu-smsd-monitor
 %{_sbindir}/rcgammu-smsd
-%doc %{_mandir}/man1/gammu-smsd-inject.1%{ext_man}
-%doc %{_mandir}/man1/gammu-smsd-monitor.1%{ext_man}
-%doc %{_mandir}/man1/gammu-smsd.1%{ext_man}
-%doc %{_mandir}/man5/gammu-smsdrc.5%{ext_man}
-%doc %{_mandir}/man7/gammu-smsd-dbi.7%{ext_man}
-%doc %{_mandir}/man7/gammu-smsd-files.7%{ext_man}
-%doc %{_mandir}/man7/gammu-smsd-mysql.7%{ext_man}
-%doc %{_mandir}/man7/gammu-smsd-null.7%{ext_man}
-%doc %{_mandir}/man7/gammu-smsd-odbc.7%{ext_man}
-%doc %{_mandir}/man7/gammu-smsd-pgsql.7%{ext_man}
-%doc %{_mandir}/man7/gammu-smsd-run.7%{ext_man}
-%doc %{_mandir}/man7/gammu-smsd-sql.7%{ext_man}
-%doc %{_mandir}/man7/gammu-smsd-tables.7%{ext_man}
+%doc %{_mandir}/man1/gammu-smsd-inject.1*
+%doc %{_mandir}/man1/gammu-smsd-monitor.1*
+%doc %{_mandir}/man1/gammu-smsd.1*
+%doc %{_mandir}/man5/gammu-smsdrc.5*
+%doc %{_mandir}/man7/gammu-smsd-dbi.7*
+%doc %{_mandir}/man7/gammu-smsd-files.7*
+%doc %{_mandir}/man7/gammu-smsd-mysql.7*
+%doc %{_mandir}/man7/gammu-smsd-null.7*
+%doc %{_mandir}/man7/gammu-smsd-odbc.7*
+%doc %{_mandir}/man7/gammu-smsd-pgsql.7*
+%doc %{_mandir}/man7/gammu-smsd-run.7*
+%doc %{_mandir}/man7/gammu-smsd-sql.7*
+%doc %{_mandir}/man7/gammu-smsd-tables.7*
 
 %files -n libGammu7 -f libgammu.lang
 %defattr(-,root,root,-)
@@ -420,7 +413,7 @@ fi
 
 %files -n python-gammu
 %defattr(-,root,root,-)
-%doc README.Python python/examples
+%doc README.Python python/examples/
 %{g_python_sitearch}/gammu/
 
 %changelog