diff --git a/gnokii-smsd.init b/gnokii-smsd.init
index 0cf7a25..9f14c15 100644
--- a/gnokii-smsd.init
+++ b/gnokii-smsd.init
@@ -9,7 +9,7 @@
 # config:      /etc/gnokiirc
 # config:      /etc/sysconfig/gnokii-smsd
 
-exec=/usr/sbin/gnokii-smsd
+exec=/usr/bin/gnokii-smsd
 prog=$(basename $exec)
 
 # Make sure relevant files exist
diff --git a/gnokii.spec b/gnokii.spec
index f084bdc..7a3f3e8 100644
--- a/gnokii.spec
+++ b/gnokii.spec
@@ -2,7 +2,7 @@
 
 Name:           gnokii
 Version:        0.6.25
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Linux/Unix tool suite for various mobile phones
 
 Group:          Applications/Communications
@@ -120,6 +120,7 @@ rm $RPM_BUILD_ROOT%{_libdir}{,/smsd}/lib*.la
 # Fix up the default desktop file
 desktop-file-install \
   --delete-original \
+  --vendor "" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --mode 644 \
   --add-category X-Fedora \
@@ -226,6 +227,10 @@ fi
 %{_libdir}/pkgconfig/xgnokii.pc
 
 %changelog
+* Fri May 23 2008 Robert Scheck <robert@fedoraproject.org> 0.6.25-2
+- Set empty --vendor rather none for using desktop-file-install
+- Fixed initscript as gnokii-smsd stays in /usr/bin not /usr/sbin
+
 * Mon May 19 2008 - Bastien Nocera <bnocera@redhat.com> - 0.6.25-1
 - Update to 0.6.25