diff --git a/general/general.ent b/general/general.ent
index dfa6995c7b..2f88762fc2 100644
--- a/general/general.ent
+++ b/general/general.ent
@@ -19,7 +19,6 @@
-
%openssl;
%pcre;
@@ -38,7 +37,6 @@
%guile;
%slib;
%gwrap;
-%gcc2lib;
%STLport;
@@ -95,6 +93,7 @@
+
%python;
%perl-modules;
%librep;
@@ -102,3 +101,4 @@
%ruby;
%gnat;
%gcc;
+%gcc2;
diff --git a/general/genlib/gcc2lib.xml b/general/genlib/gcc2lib.xml
deleted file mode 100644
index d8a05944cd..0000000000
--- a/general/genlib/gcc2lib.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-gcc2lib-&gcc2lib-version;
-
-&gcc2lib-intro;
-&gcc2lib-inst;
-&gcc2lib-exp;
-&gcc2lib-config;
-&gcc2lib-desc;
-
-
-
diff --git a/general/genlib/genlib.xml b/general/genlib/genlib.xml
index b9378bcb2b..7499e14b3f 100644
--- a/general/genlib/genlib.xml
+++ b/general/genlib/genlib.xml
@@ -51,6 +51,5 @@ them.
&guile;
&slib;
&gwrap;
-&gcc2lib;
&STLport;
diff --git a/general/prog/gcc2.xml b/general/prog/gcc2.xml
new file mode 100644
index 0000000000..5db5b0f365
--- /dev/null
+++ b/general/prog/gcc2.xml
@@ -0,0 +1,11 @@
+
+
+gcc2-&gcc2-version;
+
+&gcc2-intro;
+&gcc2-inst;
+&gcc2-config;
+&gcc2-desc;
+
+
+
diff --git a/general/prog/gcc2/gcc2-config.xml b/general/prog/gcc2/gcc2-config.xml
new file mode 100644
index 0000000000..f5d0c1f796
--- /dev/null
+++ b/general/prog/gcc2/gcc2-config.xml
@@ -0,0 +1,21 @@
+
+Configuring gcc2
+
+Configuration Information
+
+&library-config;
+
+The instructions given above make compatibility symlinks that pre-compiled
+packages in BLFS require. You may create additional compatibility links based on
+your requirements.
+
+If you only need the gcc2 libraries, you may delete /opt/gcc2.
+
+Whenever you need to use gcc2 instead of you system installed compiler,
+add /opt/gcc2/bin to the front of your PATH before compiling the concerned
+package.
+
+
+
+
+
diff --git a/general/prog/gcc2/gcc2-desc.xml b/general/prog/gcc2/gcc2-desc.xml
new file mode 100644
index 0000000000..ba4e3cbc72
--- /dev/null
+++ b/general/prog/gcc2/gcc2-desc.xml
@@ -0,0 +1,10 @@
+
+Contents
+
+The gcc2 package contains the gcc2 c and c++ compilers
+and gcc2
+libstdc++.so that is required by some commercial and pre-compiled
+packages.
+
+
+
diff --git a/general/prog/gcc2/gcc2-inst.xml b/general/prog/gcc2/gcc2-inst.xml
new file mode 100644
index 0000000000..eaad1a8e8f
--- /dev/null
+++ b/general/prog/gcc2/gcc2-inst.xml
@@ -0,0 +1,44 @@
+
+Installation of gcc2
+
+Apply the two patches, one to fix compilation and the other to stop the
+fixincludes script from executing.
+
+patch -Np1 -i ../gcc-&gcc2-version;-1.patch &&
+patch -Np1 -i ../gcc-&gcc2-version;-no-fixinc.patch
+
+The gcc development team recommends building in a seperate directory.
+
+mkdir ../gcc-build &&
+cd ../gcc-build
+
+Configure gcc to build the c and c++ compilers and enable the related c++
+options.
+../gcc-&gcc2-version;/configure \
+--prefix=/opt/gcc2 \
+--enable-shared --enable-languages=c,c++ \
+--enable-threads=posix
+
+Compile and install gcc and remove unneeded directories (adjust the
+machine triplet to match your architecture).
+make bootstrap &&
+make install &&
+ln -sf gcc /opt/gcc2/bin/cc &&
+rm -rf /opt/gcc2/{i686-pc-linux-gnu,info,man}
+
+Make note of the library that is installed.
+L=`find /opt/gcc2/lib -name "*libstdc++*.so" -type f` &&
+IL=`basename $L`
+
+Move the c++ libraries to the standard lib directory to avoid having to
+add /opt/gcc2/lib to /etc/ld.so.conf.
+
+for i in /opt/gcc2/lib/*.so*; do mv -f $i /usr/lib;
+ln -sf /usr/lib/`basename $i` /opt/gcc2/lib; done
+
+Create symlinks required by commercial and precompiled packages.
+ln -sf $IL /usr/lib/libstdc++-libc6.1-1.so.2 &&
+ln -sf $IL /usr/lib/libstdc++-libc6.2-2.so.3 &&
+ln -sf $IL /usr/lib/libstdc++-libc6.3-2.so.3
+
+
diff --git a/general/prog/gcc2/gcc2-intro.xml b/general/prog/gcc2/gcc2-intro.xml
new file mode 100644
index 0000000000..500b852b33
--- /dev/null
+++ b/general/prog/gcc2/gcc2-intro.xml
@@ -0,0 +1,19 @@
+
+Introduction to gcc2-&gcc2-version;
+
+Download location (FTP):
+Version used: &gcc2-version;
+Package size: &gcc2-size;
+Estimated Disk space required: &gcc2-buildsize;
+
+There are two reasons for installing gcc2. The first is that the kernel
+developers have certified gcc2 as the preferred compiler for compiling the
+kernel. The other (and more compelling reason) is that some
+commercial closed-source packages (such as Netscape Navigator, Yahoo Pager)
+and precompiled packages (such as Mozilla)
+are linked against gcc2 libs.
+
+Download the gcc patches from .
+
+
+
diff --git a/general/prog/gcc2/gcc2.ent b/general/prog/gcc2/gcc2.ent
new file mode 100644
index 0000000000..3d4daff210
--- /dev/null
+++ b/general/prog/gcc2/gcc2.ent
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/general/prog/jdk/j2sdk-intro.xml b/general/prog/jdk/j2sdk-intro.xml
index 493493fe87..3bbbb5b220 100644
--- a/general/prog/jdk/j2sdk-intro.xml
+++ b/general/prog/jdk/j2sdk-intro.xml
@@ -43,6 +43,6 @@ restrictions, blackdown has a gcc3 based precompiled version.
Check out for more information.
j2sdk depends on:
-, , , , ,
+, , , , ,
diff --git a/general/prog/prog.xml b/general/prog/prog.xml
index 7ad5922ed7..079236b498 100644
--- a/general/prog/prog.xml
+++ b/general/prog/prog.xml
@@ -9,5 +9,6 @@
&ruby;
&gnat;
&gcc;
+&gcc2;
diff --git a/index.xml b/index.xml
index 5cbfd19dad..07a3a3f923 100644
--- a/index.xml
+++ b/index.xml
@@ -2,8 +2,8 @@
-
+
+
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index aef5c11c2c..a06342f469 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -10,6 +10,9 @@ page in Chapter 1 for details on who wrote what.
+March 31th, 2003 [tushar]: prog: removed gcc2libs, added
+complete gcc suite.
+
March 30th, 2003 [tushar]: j2sdk: updated jdk to
1.4.1_02.
diff --git a/introduction/welcome/credits.xml b/introduction/welcome/credits.xml
index c1132b7dd4..433612eb81 100644
--- a/introduction/welcome/credits.xml
+++ b/introduction/welcome/credits.xml
@@ -91,7 +91,7 @@ gtk-thinice-engine, eel, imlib, intltool,
lame, libao, libart_lgpl, libbonobo, libbonoboui, libgail-gnome,
libglade2, libgnome, libgnomecanvas, libgnomeprint, libgnomeprintui,
libgnomeui, libgtkhtml, libgtop, libIDL, libogg, librep, librsvg,
-libvorbis, libwnck, libxml2, libxslt, linc, LPRng, Lunux_PAM,
+libvorbis, libwnck, libxml2, libxslt, linc, LPRng, Linux_PAM,
metacity, MPlayer, mutt, nautilus, nautilus-media, oaf, OpenJade, OpenSP,
OpenSSH, ORBit, ORBit2, pan, Pango, pccts, pcre, pkgconfig, postfix,
procmail, Python, QT, rep-gtk, ruby, sawfish, scrollkeeper, sgml-common,
@@ -184,7 +184,7 @@ developed.
so many times (I thought my four was a lot) and being very helpful with
his comments on that section.
-Ted Riley for writing the Linxu-PAM
+Ted Riley for writing the Linux-PAM
+ CrackLib + Shadow hint on which reinstalling shadow to use PAM is
based.