diff --git a/_service:format_spec_file:obs-service-format_spec_file.spec b/_service:format_spec_file:obs-service-format_spec_file.spec
deleted file mode 100644
index 4292245..0000000
--- a/_service:format_spec_file:obs-service-format_spec_file.spec
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# spec file for package obs-service-format_spec_file
-#
-# 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
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-
-
-Name:           obs-service-format_spec_file
-License:        GPL v2 or later
-Group:          Development/Tools/Building
-Summary:        An OBS source service: reformats a spec file to SUSE standard.
-Version:        0.1
-Release:        1
-Source:         format_spec_file
-Source1:        format_spec_file.service
-Source2:        prepare_spec
-Requires:       osc-source_validator
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
-
-
-%description
-This is a source service for openSUSE Build Service.
-
-This source service is formating the spec file to SUSE standard. The rational
-behind is to make it easier to review spec files from unknown packagers.
-
-This should be used in "trylocal" mode, so that osc is adapting the existing
-spec file instead of creating a new one.
-
-%prep
-
-%setup -q -D -T 0 -n .
-
-
-%build
-
-
-%install
-mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files
-install -m 0755 %{SOURCE0} $RPM_BUILD_ROOT/usr/lib/obs/service
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service
-install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files
-
-
-%files
-%defattr(-,root,root)
-%dir /usr/lib/obs
-/usr/lib/obs/service
-
-
-%changelog
diff --git a/format_spec_file b/format_spec_file
index da13fda..e6da271 100644
--- a/format_spec_file
+++ b/format_spec_file
@@ -20,7 +20,13 @@ done
 
 RETURN=0
 for i in *.spec; do
+  if [ "$i" == '*.spec' ]; then
+    echo "WARNING: no spec file found"
+    exit 0
+  fi
   /usr/lib/obs/service/format_spec_file.files/prepare_spec "$i" > "$MYOUTDIR/$i" || RETURN=1
+  # remove all file files which are indendical to committed files
+  cmp -s "$i" "$MYOUTDIR/$i" && rm "$MYOUTDIR/$i"
 done
 
 exit $RETURN
diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes
index 7d0c5c9..7911eca 100644
--- a/obs-service-format_spec_file.changes
+++ b/obs-service-format_spec_file.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue May 31 08:03:34 UTC 2011 - adrian@suse.de
+
+- do not fail on kiwi packages
+
+-------------------------------------------------------------------
+Wed May 25 15:34:28 UTC 2011 - adrian@suse.de
+
+- do not generate new spec files when no changes happened
+
 -------------------------------------------------------------------
 Wed May 25 14:00:35 CEST 2011 - ro@suse.de
 
diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec
index 5fe92e6..4b9e4e0 100644
--- a/obs-service-format_spec_file.spec
+++ b/obs-service-format_spec_file.spec
@@ -30,6 +30,7 @@ Requires:       osc-source_validator
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
+
 %description
 This is a source service for openSUSE Build Service.
 
@@ -43,16 +44,22 @@ spec file instead of creating a new one.
 
 %setup -q -D -T 0 -n .
 
+
 %build
 
+
 %install
 mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files
 install -m 0755 %{SOURCE0} $RPM_BUILD_ROOT/usr/lib/obs/service
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service
 install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files
 
+
 %files
 %defattr(-,root,root)
 %dir /usr/lib/obs
 /usr/lib/obs/service
+
+
+
 %changelog