diff --git a/freetype2.changes b/freetype2.changes
index 6c025a1..10165fa 100644
--- a/freetype2.changes
+++ b/freetype2.changes
@@ -1,3 +1,45 @@
+-------------------------------------------------------------------
+Tue Jun  9 08:18:50 UTC 2015 - fstrba@suse.com
+
+- Merge with the version 2.5.5 from openSUSE:Factory
+- Removed patches:
+  * CVE-2014-9656.patch
+  * CVE-2014-9657.patch
+  * CVE-2014-9658.patch
+  * CVE-2014-9659.patch
+  * CVE-2014-9660.patch
+  * CVE-2014-9661.patch
+  * CVE-2014-9662.patch
+  * CVE-2014-9663.patch
+  * CVE-2014-9664.patch
+  * CVE-2014-9665.patch
+  * CVE-2014-9666.patch
+  * CVE-2014-9667.patch
+  * CVE-2014-9668.patch
+  * CVE-2014-9669.patch
+  * CVE-2014-9670.patch
+  * CVE-2014-9671.patch
+  * CVE-2014-9672.patch
+  * CVE-2014-9673.patch
+  * CVE-2014-9674.patch
+  * CVE-2014-9675.patch
+    - Integrated in the 2.5.5 release
+- Modified patches:
+  * don-t-mark-libpng-as-required-library.patch
+  * bugzilla-308961-cmex-workaround.patch
+  * freetype2-subpixel.patch
+  * freetype2-bitmap-foundry.patch
+  * overflow.patch
+    - Adapt to the new version of sources
+
+-------------------------------------------------------------------
+Wed Jun  3 08:14:53 UTC 2015 - fstrba@suse.com
+
+- Modified patch:
+  * CVE-2014-9671.patch
+    - Adapt the code to correspond to the current git master of
+      freetype2 (fixes bsc#933247)
+
 -------------------------------------------------------------------
 Fri Apr 10 07:34:20 UTC 2015 - fstrba@suse.com
 
@@ -6,6 +48,35 @@ Fri Apr 10 07:34:20 UTC 2015 - fstrba@suse.com
   applied.
 - Run spec-cleaner on the spec file.
 
+-------------------------------------------------------------------
+Fri Feb 20 10:13:37 UTC 2015 - nadvornik@suse.com
+
+- fixed vulnerabilities (bnc#916847, bnc#916856, bnc#916857,
+  bnc#916858, bnc#916859, bnc#916860, bnc#916861, bnc#916862,
+  bnc#916863, bnc#916864, bnc#916865, bnc#916867, bnc#916868,
+  bnc#916870, bnc#916871, bnc#916872, bnc#916873, bnc#916874,
+  bnc#916879, bnc#916881)
+  - CVE-2014-9656.patch
+  - CVE-2014-9657.patch
+  - CVE-2014-9658.patch
+  - CVE-2014-9659.patch
+  - CVE-2014-9660.patch
+  - CVE-2014-9661.patch
+  - CVE-2014-9662.patch
+  - CVE-2014-9663.patch
+  - CVE-2014-9664.patch
+  - CVE-2014-9665.patch
+  - CVE-2014-9666.patch
+  - CVE-2014-9667.patch
+  - CVE-2014-9668.patch
+  - CVE-2014-9669.patch
+  - CVE-2014-9670.patch
+  - CVE-2014-9671.patch
+  - CVE-2014-9672.patch
+  - CVE-2014-9673.patch
+  - CVE-2014-9674.patch
+  - CVE-2014-9675.patch
+
 -------------------------------------------------------------------
 Sat Jan  3 22:58:50 UTC 2015 - hrvoje.senjan@gmail.com
 
@@ -69,6 +140,12 @@ Mon Dec  8 15:43:58 UTC 2014 - hrvoje.senjan@gmail.com
   http://savannah.nongnu.org/bugs/?43774, "Freetype 2.5.4 does not
   load ungzipped PCF fonts"
 
+-------------------------------------------------------------------
+Thu Mar 27 09:57:06 UTC 2014 - nadvornik@suse.com
+
+- get 2.5.3 from Factory as it fixes 
+  CVE-2014-2240 CVE-2014-2241 (bnc#867620)
+
 -------------------------------------------------------------------
 Thu Mar 13 03:14:26 UTC 2014 - hrvoje.senjan@gmail.com
 
diff --git a/ft2demos.changes b/ft2demos.changes
index 143dc05..347e30e 100644
--- a/ft2demos.changes
+++ b/ft2demos.changes
@@ -1,8 +1,79 @@
+-------------------------------------------------------------------
+Tue Jun  9 08:18:50 UTC 2015 - fstrba@suse.com
+
+- Merge with the version 2.5.5 from openSUSE:Factory
+- Removed patches:
+  * CVE-2014-9656.patch
+  * CVE-2014-9657.patch
+  * CVE-2014-9658.patch
+  * CVE-2014-9659.patch
+  * CVE-2014-9660.patch
+  * CVE-2014-9661.patch
+  * CVE-2014-9662.patch
+  * CVE-2014-9663.patch
+  * CVE-2014-9664.patch
+  * CVE-2014-9665.patch
+  * CVE-2014-9666.patch
+  * CVE-2014-9667.patch
+  * CVE-2014-9668.patch
+  * CVE-2014-9669.patch
+  * CVE-2014-9670.patch
+  * CVE-2014-9671.patch
+  * CVE-2014-9672.patch
+  * CVE-2014-9673.patch
+  * CVE-2014-9674.patch
+  * CVE-2014-9675.patch
+    - Integrated in the 2.5.5 release
+- Modified patches:
+  * don-t-mark-libpng-as-required-library.patch
+  * bugzilla-308961-cmex-workaround.patch
+  * freetype2-subpixel.patch
+  * freetype2-bitmap-foundry.patch
+  * overflow.patch
+    - Adapt to the new version of sources
+
+-------------------------------------------------------------------
+Wed Jun  3 08:14:53 UTC 2015 - fstrba@suse.com
+
+- Modified patch:
+  * CVE-2014-9671.patch
+    - Adapt the code to correspond to the current git master of
+      freetype2 (fixes bsc#933247)
+
 -------------------------------------------------------------------
 Fri Apr 10 07:34:20 UTC 2015 - fstrba@suse.com
 
 - Run spec-cleaner on the spec file.
 
+-------------------------------------------------------------------
+Fri Feb 20 10:13:37 UTC 2015 - nadvornik@suse.com
+
+- fixed vulnerabilities (bnc#916847, bnc#916856, bnc#916857,
+  bnc#916858, bnc#916859, bnc#916860, bnc#916861, bnc#916862,
+  bnc#916863, bnc#916864, bnc#916865, bnc#916867, bnc#916868,
+  bnc#916870, bnc#916871, bnc#916872, bnc#916873, bnc#916874,
+  bnc#916879, bnc#916881)
+  - CVE-2014-9656.patch
+  - CVE-2014-9657.patch
+  - CVE-2014-9658.patch
+  - CVE-2014-9659.patch
+  - CVE-2014-9660.patch
+  - CVE-2014-9661.patch
+  - CVE-2014-9662.patch
+  - CVE-2014-9663.patch
+  - CVE-2014-9664.patch
+  - CVE-2014-9665.patch
+  - CVE-2014-9666.patch
+  - CVE-2014-9667.patch
+  - CVE-2014-9668.patch
+  - CVE-2014-9669.patch
+  - CVE-2014-9670.patch
+  - CVE-2014-9671.patch
+  - CVE-2014-9672.patch
+  - CVE-2014-9673.patch
+  - CVE-2014-9674.patch
+  - CVE-2014-9675.patch
+
 -------------------------------------------------------------------
 Sat Jan  3 22:58:50 UTC 2015 - hrvoje.senjan@gmail.com
 
@@ -66,6 +137,12 @@ Mon Dec  8 15:43:58 UTC 2014 - hrvoje.senjan@gmail.com
   http://savannah.nongnu.org/bugs/?43774, "Freetype 2.5.4 does not
   load ungzipped PCF fonts"
 
+-------------------------------------------------------------------
+Wed May  7 14:41:16 CEST 2014 - ro@suse.de
+
+- mark bnc628213_test.otf as NoSource to avoid triggering
+  clamav check 
+
 -------------------------------------------------------------------
 Thu Mar 13 03:14:26 UTC 2014 - hrvoje.senjan@gmail.com
 
diff --git a/ft2demos.spec b/ft2demos.spec
index 73adb3f..d314840 100644
--- a/ft2demos.spec
+++ b/ft2demos.spec
@@ -41,6 +41,8 @@ BuildRequires:  libpng-devel
 BuildRequires:  xorg-x11-devel
 Supplements:    fonts-config
 Conflicts:      dtc
+# silence our clamav check
+NoSource:       1000
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
diff --git a/pre_checkin.sh b/pre_checkin.sh
deleted file mode 100644
index 473a0f4..0000000