diff --git a/gcc.changes b/gcc.changes
index 472b902..95c1c51 100644
--- a/gcc.changes
+++ b/gcc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec 10 11:53:06 UTC 2010 - rguenther@novell.com
+
+- Add info directory aliases for unversioned variants of the
+  GCC user manuals.  [bnc#635355]
+
 -------------------------------------------------------------------
 Mon Nov 29 12:24:23 UTC 2010 - rguenther@novell.com
 
diff --git a/gcc.spec b/gcc.spec
index 7189960..fd91c4f 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -113,11 +113,32 @@ The system GNU Compiler locale files.
 License:        GFDLv1.1
 Group:          Development/Languages/C and C++
 Summary:        The system GNU Compiler documentation
+PreReq:         %{install_info_prereq}
 Requires:       gcc%{gcc_version}-info
 
 %description -n gcc-info
 The system GNU Compiler documentation.
 
+# There is intentionally no postun with install_info_delete as there
+# is no way to just remove the aliased entries.  The content owners
+# install_info_delete will also remove the aliases though.
+# install-info does not pick up descriptions from the content.
+%post -n gcc-info
+%install_info --info-dir=%{_infodir} \
+	--name=cpp --description=\"The GNU C preprocessor.\" \
+	%{_infodir}/cpp-%{gcc_suffix}.info.gz
+%install_info --info-dir=%{_infodir} \
+	--name=gcc --description=\"The GNU Compiler Collection.\" \
+	%{_infodir}/gcc-%{gcc_suffix}.info.gz
+%install_info --info-dir=%{_infodir} \
+	--name=g++ --description=\"The GNU C++ compiler.\" \
+	%{_infodir}/g++-%{gcc_suffix}.info.gz
+%install_info --info-dir=%{_infodir} \
+	--name=gcj --description=\"Ahead-of-time compiler for the Java language\" \
+	%{_infodir}/gcj-%{gcc_suffix}.info.gz
+%install_info --info-dir=%{_infodir} \
+	--name=gfortran --description=\"The GNU Fortran compiler.\" \
+	%{_infodir}/gfortran-%{gcc_suffix}.info.gz
 
 
 %package -n gcc-c++