diff --git a/core_35.list b/core_35.list
new file mode 100644
index 00000000..15dd2932
--- /dev/null
+++ b/core_35.list
@@ -0,0 +1,38 @@
+2016-04-27 /programming/library/slang/pspec.xml
+2016-08-17 /system/base/lsb-release/pspec.xml
+2016-06-16 /system/base/usbutils/pspec.xml
+2016-04-27 /system/base/comar-api/pspec.xml
+2016-04-27 /system/base/comar/pspec.xml
+2016-04-27 /system/base/baselayout/pspec.xml
+2016-04-27 /system/base/wireless-tools/pspec.xml
+2016-04-27 /system/base/coreutils/pspec.xml
+2016-04-27 /system/base/sysvinit/pspec.xml
+2016-04-27 /system/base/mudur/pspec.xml
+2016-12-01 /system/devel/cmake/pspec.xml
+2016-04-27 /system/devel/scons/pspec.xml
+2016-04-27 /system/devel/util-macros/pspec.xml
+2016-04-27 /system/devel/colorgcc/pspec.xml
+2016-04-27 /system/devel/catbox/pspec.xml
+2016-04-27 /system/devel/xorg-util/pspec.xml
+2016-04-27 /system/devel/numactl/pspec.xml
+2016-04-27 /system/devel/klibc/pspec.xml
+2016-12-02 /system/devel/libuv/pspec.xml
+2016-04-27 /system/devel/libarchive/pspec.xml
+2016-04-27 /system/devel/glpk/pspec.xml
+2016-04-27 /system/devel/cloog/pspec.xml
+2016-04-27 /system/devel/unifdef/pspec.xml
+2016-07-19 /system/devel/libseccomp/pspec.xml
+2016-04-27 /system/devel/ppl/pspec.xml
+2016-04-27 /system/devel/gobject-introspection/pspec.xml
+2016-04-27 /system/devel/yasm/pspec.xml
+2016-04-27 /system/boot/busybox-mkinitcpio/pspec.xml
+2016-04-27 /system/boot/os-prober/pspec.xml
+2016-08-21 /system/boot/grub2/pspec.xml
+2016-12-10 /kernel/drivers/ndiswrapper/pspec.xml
+2016-12-10 /kernel/drivers/module-bbswitch/pspec.xml
+2016-04-27 /kernel/tools/mkinitcpio/pspec.xml
+2016-12-10 /kernel/tools/cpupowertools/pspec.xml
+2016-04-27 /kernel/tools/mkinitramfs/pspec.xml
+2016-04-27 /desktop/font/freetype/pspec.xml
+2016-06-29 /hardware/firmware/linux-firmware/pspec.xml
+2016-04-27 /hardware/disk/disktype/pspec.xml
diff --git a/find-packages-not-compiled-in-farm b/find-packages-not-compiled-in-farm
index 3d891871..2da69971 100755
--- a/find-packages-not-compiled-in-farm
+++ b/find-packages-not-compiled-in-farm
@@ -15,7 +15,7 @@ import lzma
 
 import piksemel
 
-pisirepouri = "http://ciftlik.pisilinux.org/2.0-Beta/pisi-index.xml.xz"
+pisirepouri = "http://ciftlik.pisilinux.org/2.0-Beta.1/pisi-index.xml.xz"
 svnrepouri  = "https://github.com/ertugerata/core/raw/master/pisi-index.xml.xz"
 
 def getIndex(uri):
diff --git a/multimedia/graphics/libpng/files/libpng-1.6.18-apng.patch.gz b/multimedia/graphics/libpng/files/libpng-1.6.18-apng.patch.gz
deleted file mode 100644
index bfce19ff..00000000
Binary files a/multimedia/graphics/libpng/files/libpng-1.6.18-apng.patch.gz and /dev/null differ
diff --git a/multimedia/graphics/libpng/files/libpng-1.6.21-apng.patch.gz b/multimedia/graphics/libpng/files/libpng-1.6.21-apng.patch.gz
deleted file mode 100644
index 4dd296b9..00000000
Binary files a/multimedia/graphics/libpng/files/libpng-1.6.21-apng.patch.gz and /dev/null differ
diff --git a/multimedia/graphics/libpng/files/libpng-1.6.28-apng.patch.gz b/multimedia/graphics/libpng/files/libpng-1.6.28-apng.patch.gz
new file mode 100644
index 00000000..7cabf399
Binary files /dev/null and b/multimedia/graphics/libpng/files/libpng-1.6.28-apng.patch.gz differ
diff --git a/multimedia/graphics/libpng/pspec.xml b/multimedia/graphics/libpng/pspec.xml
index f699f853..a088c2c1 100644
--- a/multimedia/graphics/libpng/pspec.xml
+++ b/multimedia/graphics/libpng/pspec.xml
@@ -17,7 +17,7 @@
             <Dependency>zlib-devel</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch level="1" compressionType="gz">libpng-1.6.21-apng.patch.gz</Patch>
+            <Patch level="1" compressionType="gz">libpng-1.6.28-apng.patch.gz</Patch>
             <Patch level="1">libpng-multilib.patch</Patch>
         </Patches>
     </Source>
diff --git a/needed_build.txt b/needed_build.txt
new file mode 100644
index 00000000..96576169
--- /dev/null
+++ b/needed_build.txt
@@ -0,0 +1,13 @@
+
+* working on https://github.com/ertugerata/core/raw/master/pisi-index.xml.xz
+* working on http://ciftlik.pisilinux.org/2.0-Beta.1/pisi-index.xml.xz
+
+* Packages missing in http://ciftlik.pisilinux.org/2.0-Beta.1/pisi-index.xml.xz
+  kernel/tools/mkinitcpio
+  system/boot/busybox-mkinitcpio
+
+* Packages that needs compiling
+  system/base/busybox  (3 > 2)
+  system/base/net-tools  (3 > 2)
+  system/base/pcmciautils  (3 > 2)
+
diff --git a/system/base/comar-api/pspec.xml b/system/base/comar-api/pspec.xml
index 1fecb32e..162d352d 100644
--- a/system/base/comar-api/pspec.xml
+++ b/system/base/comar-api/pspec.xml
@@ -12,15 +12,15 @@
         <IsA>library</IsA>
         <Summary>Utility functions for Comar scripts</Summary>
         <Description>Generic utility library for common Comar script operations.</Description>
-        <Archive sha1sum="80afa9f07cd15b9042cce9c1b8f1c4dcd457c552" type="targz">http://source.pisilinux.org/1.0/comar-api-2.4.9.tar.gz</Archive>
+        <Archive sha1sum="80d3ebca0e57e1c5c5d649e92342676452da65d7" type="targz">https://github.com/PisiLinuxNew/comar-api/archive/v2.4.9.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>python</Dependency>
         </BuildDependencies>
-        <Patches>
+        <!--Patches>
             <Patch level="1">run_dir.patch</Patch>
             <Patch level="1">pisilinux.patch</Patch>
             <Patch level="1">add-stopdependencies.patch</Patch>
-        </Patches>
+        </Patches-->
     </Source>
 
     <Package>
@@ -36,6 +36,13 @@
     </Package>
 
     <History>
+        <Update release="3">
+            <Date>2017-02-05</Date>
+            <Version>2.4.9</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="2">
             <Date>2016-04-27</Date>
             <Version>2.4.9</Version>
diff --git a/system/base/comar/pspec.xml b/system/base/comar/pspec.xml
index c01eff64..db6ed2fb 100644
--- a/system/base/comar/pspec.xml
+++ b/system/base/comar/pspec.xml
@@ -12,17 +12,17 @@
         <IsA>service</IsA>
         <Summary>Manages system configuration</Summary>
         <Description>Pisi Linux programs are packaged with small scripts which configures them to entegrate with system and each other. Çomar is the tool which manages and executes these scripts.</Description>
-        <Archive sha1sum="a0894a20d3c2bb5843de7e25fc98707baf554df1" type="tarbz2">http://source.pisilinux.org/1.0/comar-3.0.3.tar.bz2</Archive>
+        <Archive sha1sum="27f01ddd80919067b295eb64de3cabb235f30d4f" type="targz">https://github.com/PisiLinuxNew/comar/archive/v3.0.3.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>dbus-devel</Dependency>
             <Dependency>python-devel</Dependency>
             <Dependency>cmake</Dependency>
         </BuildDependencies>
-        <Patches>
+        <!--Patches>
             <Patch level="1">run_dir.patch</Patch>
             <Patch level="1">fix-flags.patch</Patch>
             <Patch level="1">update-system-manager-model.patch</Patch>
-        </Patches>
+        </Patches-->
     </Source>
 
     <Package>
@@ -48,6 +48,13 @@
     </Package>
 
     <History>
+        <Update release="3">
+            <Date>2017-02-05</Date>
+            <Version>3.0.3</Version>
+            <Comment>Rebuild, use pisilinuxnew source url.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="2">
             <Date>2016-04-27</Date>
             <Version>3.0.3</Version>
diff --git a/system/base/mudur/pspec.xml b/system/base/mudur/pspec.xml
index 29453e20..e0d623ee 100644
--- a/system/base/mudur/pspec.xml
+++ b/system/base/mudur/pspec.xml
@@ -12,13 +12,13 @@
         <IsA>app:console</IsA>
         <Summary>Pisi Linux boot and initialization system</Summary>
         <Description>mudur handles mounting of the filesystems, loading of the device drivers, starting of the system services, and other jobs during the Pisi Linux boot and shutdown sequences.</Description>
-        <Archive sha1sum="42c9163b5fe3d9682caa20f639fbec1d0be784cd" type="tarxz">http://source.pisilinux.org/1.0/mudur-4.4.0.tar.xz</Archive>
+        <Archive sha1sum="8808b017cd09597bf32c3e81a1b602eca1afb7e0" type="targz">https://github.com/PisiLinuxNew/mudur/archive/v4.4.0.tar.gz</Archive>
         <Patches>
-            <Patch>set_file_mode.patch</Patch>
+            <!--Patch>set_file_mode.patch</Patch>
             <Patch>no_err-no_msg.patch</Patch>
             <Patch>recreate_dir_if_new_uid_or_gid.patch</Patch>
             <Patch>boot_option.patch</Patch>
-            <Patch level="1">mount_cgroupfs.patch</Patch>
+            <Patch level="1">mount_cgroupfs.patch</Patch-->
         </Patches>
     </Source>
 
@@ -61,6 +61,13 @@
     </Package>
 
     <History>
+        <Update release="3">
+            <Date>2017-02-05</Date>
+            <Version>4.4.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="2">
             <Date>2016-04-27</Date>
             <Version>4.4.0</Version>
diff --git a/system/base/net-tools/pspec.xml b/system/base/net-tools/pspec.xml
index 33db99cf..f4af363b 100644
--- a/system/base/net-tools/pspec.xml
+++ b/system/base/net-tools/pspec.xml
@@ -60,6 +60,13 @@
     </Package>
 
     <History>
+        <Update release="3">
+            <Date>2017-01-30</Date>
+            <Version>1.60</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="2">
             <Date>2016-04-27</Date>
             <Version>1.60</Version>
diff --git a/system/devel/catbox/pspec.xml b/system/devel/catbox/pspec.xml
index 8ca70474..f301a6c5 100644
--- a/system/devel/catbox/pspec.xml
+++ b/system/devel/catbox/pspec.xml
@@ -32,6 +32,13 @@
     </Package>
 
     <History>
+        <Update release="3">
+            <Date>2017-02-05</Date>
+            <Version>1.6.1</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="2">
             <Date>2016-04-27</Date>
             <Version>1.6.1</Version>