diff --git a/crosstool-ng-1.21.0.tar.bz2 b/crosstool-ng-1.21.0.tar.bz2
deleted file mode 100644
index 9a07a17..0000000
--- a/crosstool-ng-1.21.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c64493dd033dee0eb25903e66cf53ff5113ee33d193a8ff1df7ebebe47bdac46
-size 19883048
diff --git a/crosstool-ng-1.22.0.tar.bz2 b/crosstool-ng-1.22.0.tar.bz2
new file mode 100644
index 0000000..ad255ab
--- /dev/null
+++ b/crosstool-ng-1.22.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d6338a9b33f9d972167049bbe76e88b1e9248466a53df08dcfe8bcfe849d8d83
+size 1621476
diff --git a/crosstool-ng-gcc5.patch b/crosstool-ng-gcc5.patch
deleted file mode 100644
index bfa3495..0000000
--- a/crosstool-ng-gcc5.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: crosstool-ng-1.21.0/kconfig/nconf.c
-===================================================================
---- crosstool-ng-1.21.0.orig/kconfig/nconf.c
-+++ crosstool-ng-1.21.0/kconfig/nconf.c
-@@ -1518,7 +1518,7 @@ int main(int ac, char **av)
- 	}
- 
- 	notimeout(stdscr, FALSE);
--	ESCDELAY = 1;
-+	set_escdelay(1);
- 
- 	/* set btns menu */
- 	curses_menu = new_menu(curses_menu_items);
diff --git a/crosstool-ng.changes b/crosstool-ng.changes
index 901c98e..f66fa47 100644
--- a/crosstool-ng.changes
+++ b/crosstool-ng.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Nov 20 13:21:59 UTC 2015 - dmitry_r@opensuse.org
+
+- Update to version 1.22.0
+  * No changelog available
+  * Drop obsolete crosstool-ng-gcc5.patch
+
 -------------------------------------------------------------------
 Wed Oct 14 11:06:12 UTC 2015 - dmitry_r@opensuse.org
 
diff --git a/crosstool-ng.spec b/crosstool-ng.spec
index 4f65c12..395c251 100644
--- a/crosstool-ng.spec
+++ b/crosstool-ng.spec
@@ -17,19 +17,18 @@
 
 
 Name:           crosstool-ng
-Version:        1.21.0
+Version:        1.22.0
 Release:        0
 Summary:        Toolchain building framework
 License:        GPL-2.0 and GPL-2.0+ and GPL-3.0+ and LGPL-2.1 and LGPL-3.0+
 Group:          Development/Tools/Building
 Url:            http://crosstool-ng.org
 Source0:        http://crosstool-ng.org/download/crosstool-ng/%{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM -- crosstool-ng-gcc5.patch -- fix build with GCC5
-Patch1:         crosstool-ng-gcc5.patch
 BuildRequires:  bison
 BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gperf
+BuildRequires:  help2man
 BuildRequires:  libtool
 BuildRequires:  makeinfo
 BuildRequires:  ncurses-devel
@@ -48,11 +47,10 @@ Requires:       xz
 crosstool-NG aims at building toolchains. Toolchains are an essential component
 in a software development project. It will compile, assemble and link the code
 that is being developed. Some pieces of the toolchain will eventually end up
-in the resulting binary/ies: static libraries are but an example. 
+in the resulting binary/ies: static libraries are but an example.
 
 %prep
-%setup -qc %{name}-%{version}
-%patch1 -p1
+%setup -qn %{name}
 # from legal team
 # "Distribution and use is free, also for commercial purposes" (no modification permission) 
 find patches/ -name '*-new-valencian-locale.patch' -type f -delete -print
@@ -65,18 +63,18 @@ make %{?_smp_mflags}
 
 %install
 %make_install
-%fdupes %{buildroot}%{_libdir}/ct-ng.%{version}/
+%fdupes %{buildroot}%{_libdir}/%{name}-%{version}/
 
-find %{buildroot}%{_libdir}/ct-ng.%{version}/ -name '.gitignore' -type f -delete -print
+find %{buildroot}%{_libdir}/%{name}-%{version}/ -name '.gitignore' -type f -delete -print
 
-mv %{buildroot}%{_docdir}/%{name}/ct-ng.%{version}/* %{buildroot}%{_docdir}/%{name}/
-rm -rf %{buildroot}%{_docdir}/%{name}/ct-ng.%{version}/
+mv %{buildroot}%{_docdir}/%{name}/%{name}-%{version}/* %{buildroot}%{_docdir}/%{name}/
+rm -rf %{buildroot}%{_docdir}/%{name}/%{name}-%{version}/
 
 %files
 %defattr(-,root,root)
-%doc COPYING README
+%doc COPYING README.md
 %{_bindir}/ct-ng
-%{_libdir}/ct-ng.%{version}/
+%{_libdir}/%{name}-%{version}/
 %{_docdir}/%{name}/
 %{_mandir}/man1/ct-ng.1.gz