diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec
index 4365f1e..eeb6f39 100644
--- a/usb_modeswitch.spec
+++ b/usb_modeswitch.spec
@@ -1,15 +1,15 @@
 %define source_name	usb-modeswitch
 
 Name:		usb_modeswitch
-Version:	1.1.6
-Release:	2%{?dist}
+Version:	1.1.7
+Release:	1%{?dist}
 Summary:	USB Modeswitch gets mobile broadband cards in operational mode
 Summary(de):	USB Modeswitch aktiviert UMTS-Karten
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://www.draisberghof.de/usb_modeswitch/
-Source0: 	http://www.draisberghof.de/%{name}/%{source_name}-%{version}.tar.bz2
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:	http://www.draisberghof.de/%{name}/%{source_name}-%{version}.tar.bz2
+
 Requires:	usb_modeswitch-data
 BuildRequires:	libusb-devel
 
@@ -30,6 +30,11 @@ Vodafone, Option, ZTE und Novatell werden unterstützt.
 %prep
 %setup -q -n %{source_name}-%{version}
 
+# convert device_reference.txt encoding to UTF-8
+iconv --from=ISO-8859-1 --to=UTF-8 device_reference.txt > device_reference.txt.new && \
+touch -r device_reference.txt device_reference.txt.new && \
+mv device_reference.txt.new device_reference.txt
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
 
@@ -46,8 +51,7 @@ install -p -m 644 usb_modeswitch.conf $RPM_BUILD_ROOT%{_sysconfdir}/
 gzip -9c usb_modeswitch.1 > usb_modeswitch.1.gz && install -m 644 usb_modeswitch.1.gz $RPM_BUILD_ROOT%{_datadir}/man/man1
 install -p -m 755 usb_modeswitch.tcl $RPM_BUILD_ROOT/lib/udev/usb_modeswitch
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+
 
 %files
 %defattr(-,root,root,-)
@@ -59,6 +63,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Mar 28 2011 Rahul Sundaram <sundaram@fedoraproject.org> - 1.1.7-1
+- New upstream release.  Resolves rhbz#625004
+- Update spec to match current guidelines
+- Fix relevant rpmlint errors and warnings
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild