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..06621a9 100644
--- a/obs-service-format_spec_file.changes
+++ b/obs-service-format_spec_file.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Fri Jun 17 07:27:18 UTC 2011 - coolo@novell.com
+
+- do not replace licenses without knowing them (not sure this
+  is necessary at all)
+
+-------------------------------------------------------------------
+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
diff --git a/prepare_spec b/prepare_spec
index e27a4d0..01f1f11 100644
--- a/prepare_spec
+++ b/prepare_spec
@@ -592,7 +592,7 @@ while (@oldspec) {
     if ($line =~ /^%package/ && $line !~ /\\$/) {
 	$line =~ s/^(%\w+)/lc($1)/e;
 	my ($current_package, $current_lang) = set_current_pkg ( $line );
-	unless ($please_replace{"XXXLICENSE $current_package"}) {
+	unless ($please_replace{"XXXLICENSE $current_package"} || !$replace_hash{"XXXLICENSE $current_package"}) {
 		print $replace_hash{"XXXLICENSE $current_package"}."\n";
 	}
     }