diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index ac6fd06..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-PHP_CodeSniffer-1.2.0.tgz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..daae2bc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+PHP_CodeSniffer-1.2.2.tgz
+PHP_CodeSniffer-licence.txt
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 24dd3e6..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: php-pear-PHP-CodeSniffer
-# $Id$
-NAME := php-pear-PHP-CodeSniffer
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec
index 498df02..cf0f345 100644
--- a/php-pear-PHP-CodeSniffer.spec
+++ b/php-pear-PHP-CodeSniffer.spec
@@ -2,7 +2,7 @@
 %define pear_name PHP_CodeSniffer
 
 Name:           php-pear-PHP-CodeSniffer
-Version:        1.2.0
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        PHP coding standards enforcement tool
 
@@ -16,25 +16,17 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 Requires:       php-pear(PEAR)
+Requires:       php-common >= 5.1.2
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
+Provides:       phpcs = %{version}
+Obsoletes:      phpcs < %{version}
 
 %description
 PHP_CodeSniffer provides functionality to verify that code conforms to
 certain standards, such as PEAR, or user-defined.
 
-
-%package -n phpcs
-Summary:    Command-line utility for PHP-CodeSniffer
-Group:      Development/Tools
-Requires:   php-pear(%{pear_name}) = %{version}
-Requires:   php-cli
-
-%description -n phpcs
-This package includes a utility to run PHP_CodeSniffer from command line.
-
-
 %prep
 %setup -q -c
 [ -f package2.xml ] || mv package.xml package2.xml
@@ -72,7 +64,6 @@ install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
 %{__pear} install --nodeps --soft --force --register-only \
     %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
@@ -87,21 +78,23 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc %{pear_name}-%{version}/PHP_CodeSniffer-licence.txt 
+%doc %{pear_name}-%{version}/phpcs-svn-pre-commit
 %doc %{pear_name}-%{version}/docdir/*
 %{pear_xmldir}/%{pear_name}.xml
 %{pear_testdir}/%{pear_name}
-%dir %{pear_phpdir}/PHP
-%{pear_phpdir}/PHP/*
-%dir %{pear_datadir}/%{pear_name}
-
-%files -n phpcs
-%defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/PHP_CodeSniffer-licence.txt
-%doc %{pear_name}-%{version}/phpcs-svn-pre-commit
+%{pear_datadir}/%{pear_name}
+%{pear_phpdir}/PHP
 %{_bindir}/phpcs
 
-
 %changelog
+* Wed Jan 27 2010 Christof Damian <christof@damian.net> 1.2.2-1
+- upstream 1.2.2 ( bug:559170 )
+- move phpcs into main package ( bug: 517775 )
+- add php-common version requirement
+
+* Tue Nov 17 2009 Christof Damian <christof@damian.net> - 1.2.1-1
+- Upstream 1.2.1
+
 * Sat Sep 19 2009 Christof Damian <christof@damian.net> - 1.2.0-1
 - Upstream 1.2.0
 
diff --git a/sources b/sources
index 0df2690..88252ba 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-bd1caaf2741e4dc04d844bb306993898  PHP_CodeSniffer-1.2.0.tgz
+b734e066105d052fde564ab5e6be7091  PHP_CodeSniffer-1.2.2.tgz
+09df23a638e665feddffb575f7a623dc  PHP_CodeSniffer-licence.txt