diff --git a/distribution.xml b/distribution.xml
index 075cc4ab..0243150b 100644
--- a/distribution.xml
+++ b/distribution.xml
@@ -399,5 +399,6 @@
         <Package>gpicview</Package>
         <Package>lxlauncher</Package>
         <Package>screengrab</Package>
+        <Package>glibc-32bit</Package>
     </Obsoletes>
 </PISI>
diff --git a/pisi-index.xml b/pisi-index.xml
index f75ba298..7c643a44 100644
--- a/pisi-index.xml
+++ b/pisi-index.xml
@@ -4430,6 +4430,12 @@
                 <Path fileType="library">/lib32</Path>
                 <Path fileType="library">/lib/ld-linux.so.2</Path>
             </Files>
+            <Conflicts>
+                <Package>glibc-32bit</Package>
+            </Conflicts>
+            <Replaces>
+                <Package>glibc-32bit</Package>
+            </Replaces>
             <Provides>
                 <COMAR script="package.py">System.Package</COMAR>
                 <COMAR script="nscd.py" name="nscd">System.Service</COMAR>
@@ -4457,6 +4463,7 @@
         <Package>
             <Name>glibc-doc-32bit</Name>
             <Summary xml:lang="en">32-bit doc for glibc</Summary>
+            <PartOf>system.doc</PartOf>
             <BuildType>emul32</BuildType>
             <RuntimeDependencies>
                 <Dependency release="2">glibc</Dependency>
@@ -6158,7 +6165,7 @@
         </Package>
         <History>
             <Update release="2">
-                <Date>2016-04-25</Date>
+                <Date>2016-04-26</Date>
                 <Version>2.23</Version>
                 <Comment>Remove glibc-32bit repo</Comment>
                 <Name>Ertuğrul Erata</Name>
@@ -11576,7 +11583,7 @@
             <Description xml:lang="fr">La collection de compilateurs GNU inclus des façades pour le C, C++, Objective-C, Fortran, hava et Ada ainsi que des librairies pour ces langages (libstdc++, libgcj...)</Description>
             <Description xml:lang="en">The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, as well as libraries for these languages</Description>
             <Description xml:lang="tr">C, C++, Objective-C, Fortran programlama dilleri ile bu dillere ait kütüphaneleri içeren, GNU derleyici paketi</Description>
-            <Archive type="tarbz2" sha1sum="0612270b103941da08376df4d0ef4e5662a2e9eb">ftp://gd.tuwien.ac.at/gnu/gcc/releases/gcc-5.3.0/gcc-5.3.0.tar.bz2</Archive>
+            <Archive type="tarbz2" sha1sum="0612270b103941da08376df4d0ef4e5662a2e9eb">https://ftp.gnu.org/gnu/gcc/gcc-5.3.0/gcc-5.3.0.tar.bz2</Archive>
             <BuildDependencies>
                 <Dependency>binutils</Dependency>
                 <Dependency>bison</Dependency>
@@ -11594,7 +11601,6 @@
                 <Dependency>zlib-devel</Dependency>
                 <Dependency>isl-devel</Dependency>
                 <Dependency>elfutils</Dependency>
-                <Dependency>glibc-32bit</Dependency>
             </BuildDependencies>
             <Patches>
                 <Patch level="1">pisilinux/64.patch</Patch>
@@ -11699,6 +11705,13 @@
             </AdditionalFiles>
         </Package>
         <History>
+            <Update release="2">
+                <Date>2016-04-26</Date>
+                <Version>5.3.0</Version>
+                <Comment>Rebuild</Comment>
+                <Name>Ertuğrul Erata</Name>
+                <Email>ertugrulerata@gmail.com</Email>
+            </Update>
             <Update release="1">
                 <Date>2016-03-20</Date>
                 <Version>5.3.0</Version>
@@ -12319,9 +12332,6 @@
             <Description xml:lang="en">Contains commands like as, ld, nm, objdump, ar, ranlib for compiling assembly code to the machine language, and for linking and manipulating the binary object files.</Description>
             <Description xml:lang="tr">Assembly kodlarını makine diline derlemek, oluşan obje dosyalarını bağlamak ve ikili dosyalar üzerinde işlemler yapmak için kullanılan as, ld, nm, objdump, ar, ranlib gibi komutları içermektedir.</Description>
             <Archive type="tarbz2" sha1sum="a637508cffeb2323b14bc8dd65378819768ad4ff">http://ftp.gnu.org/gnu/binutils/binutils-2.26.tar.bz2</Archive>
-            <BuildDependencies>
-                <Dependency>glibc-32bit</Dependency>
-            </BuildDependencies>
             <Patches>
                 <Patch level="1">binutils-gdb.git-e20365c.patch</Patch>
             </Patches>
@@ -12341,6 +12351,13 @@
             </Files>
         </Package>
         <History>
+            <Update release="2">
+                <Date>2016-04-26</Date>
+                <Version>2.26</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Ertuğrul Erata</Name>
+                <Email>ertugrulerata@gmail.com</Email>
+            </Update>
             <Update release="1">
                 <Date>2016-04-03</Date>
                 <Version>2.26</Version>
diff --git a/pisi-index.xml.sha1sum b/pisi-index.xml.sha1sum
index 979835f0..341edfbd 100644
--- a/pisi-index.xml.sha1sum
+++ b/pisi-index.xml.sha1sum
@@ -1 +1 @@
-0d7c07ec44e4c51fd7d37fa1481dc6fceee29056
\ No newline at end of file
+e2c261cfec7ee209ac395f4a1e216be098e03db4
\ No newline at end of file
diff --git a/pisi-index.xml.xz b/pisi-index.xml.xz
index 8d3a4362..8cc9c3c4 100644
Binary files a/pisi-index.xml.xz and b/pisi-index.xml.xz differ
diff --git a/pisi-index.xml.xz.sha1sum b/pisi-index.xml.xz.sha1sum
index 7af39433..ee19369a 100644
--- a/pisi-index.xml.xz.sha1sum
+++ b/pisi-index.xml.xz.sha1sum
@@ -1 +1 @@
-965526788c2fec0383a8e52a1a9f5f0f5dbfe1d4
\ No newline at end of file
+a463b7fd5dfa411340b7657deb44e2ace2867875
\ No newline at end of file
diff --git a/system/base/glibc/pspec.xml b/system/base/glibc/pspec.xml
index ef99332b..f9916834 100644
--- a/system/base/glibc/pspec.xml
+++ b/system/base/glibc/pspec.xml
@@ -35,6 +35,12 @@
             <Dependency>gettext</Dependency>
             <Dependency versionFrom="2016a">timezone</Dependency>
         </RuntimeDependencies>
+        <Replaces>
+          <Package>glibc-32bit</Package>
+        </Replaces>
+        <Conflicts>
+          <Package>glibc-32bit</Package>
+        </Conflicts> 
         <Files>
             <Path fileType="config">/etc</Path>
             <Path fileType="library">/lib</Path>
@@ -81,6 +87,7 @@
 
     <Package>
         <Name>glibc-doc-32bit</Name>
+        <PartOf>system.doc</PartOf>
         <!-- Do not write dep. any package-->
         <Summary>32-bit doc for glibc</Summary>
         <BuildType>emul32</BuildType>
@@ -1948,7 +1955,7 @@
 
     <History>
         <Update release="2">
-            <Date>2016-04-25</Date>
+            <Date>2016-04-26</Date>
             <Version>2.23</Version>
             <Comment>Remove glibc-32bit repo</Comment>
             <Name>Ertuğrul Erata</Name>