diff --git a/desktop/gnome/base/polkit-gnome/pspec.xml b/desktop/gnome/base/polkit-gnome/pspec.xml
index 85849e2ceb..5d10b1cea1 100644
--- a/desktop/gnome/base/polkit-gnome/pspec.xml
+++ b/desktop/gnome/base/polkit-gnome/pspec.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
diff --git a/desktop/gnome/base/yelp/pspec.xml b/desktop/gnome/base/yelp/pspec.xml
index d40f8a81a0..db5af8da8a 100755
--- a/desktop/gnome/base/yelp/pspec.xml
+++ b/desktop/gnome/base/yelp/pspec.xml
@@ -3,7 +3,7 @@
 <PISI>
     <Source>
         <Name>yelp</Name>
-        <Homepage>http:/live.gnome.org/Yelp</Homepage>
+        <Homepage>https://wiki.gnome.org/Apps/Yelp</Homepage>
         <Packager>
             <Name>Ayhan Yalçınsoy</Name>
             <Email>ayhanyalcinsoy@pisilinux.org</Email>
@@ -75,4 +75,4 @@
             <Email>ayhanyalcinsoy@pisilinux.org</Email>
         </Update>
     </History>
-</PISI>
\ No newline at end of file
+</PISI>
diff --git a/desktop/lookandfeel/gtk-theme-greybird/pspec.xml b/desktop/lookandfeel/gtk-theme-greybird/pspec.xml
index 02017c9382..e04769f4c1 100644
--- a/desktop/lookandfeel/gtk-theme-greybird/pspec.xml
+++ b/desktop/lookandfeel/gtk-theme-greybird/pspec.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?> 
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
diff --git a/desktop/lookandfeel/icon-theme-faenza/pspec.xml b/desktop/lookandfeel/icon-theme-faenza/pspec.xml
index bf761df316..2fa0a806a8 100644
--- a/desktop/lookandfeel/icon-theme-faenza/pspec.xml
+++ b/desktop/lookandfeel/icon-theme-faenza/pspec.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
diff --git a/desktop/lookandfeel/icon-theme-milky/pspec.xml b/desktop/lookandfeel/icon-theme-milky/pspec.xml
index 6d6b76dbde..78d88117a7 100644
--- a/desktop/lookandfeel/icon-theme-milky/pspec.xml
+++ b/desktop/lookandfeel/icon-theme-milky/pspec.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
diff --git a/desktop/lxqt/featherpad/pspec.xml b/desktop/lxqt/featherpad/pspec.xml
index f3645379bf..cb43be9909 100644
--- a/desktop/lxqt/featherpad/pspec.xml
+++ b/desktop/lxqt/featherpad/pspec.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org.tr/projeler/pisi/pisi-spec.dtd">
+<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>featherpad</Name>
diff --git a/desktop/lxqt/libfm-extra/pspec.xml b/desktop/lxqt/libfm-extra/pspec.xml
index 488411e1ad..be2b328132 100644
--- a/desktop/lxqt/libfm-extra/pspec.xml
+++ b/desktop/lxqt/libfm-extra/pspec.xml
@@ -1,4 +1,5 @@
-
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>libfm-extra</Name>
diff --git a/desktop/lxqt/libstatgrab/pspec.xml b/desktop/lxqt/libstatgrab/pspec.xml
index 1cdcdab640..84bed226fb 100644
--- a/desktop/lxqt/libstatgrab/pspec.xml
+++ b/desktop/lxqt/libstatgrab/pspec.xml
@@ -1,4 +1,5 @@
-
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>libstatgrab</Name>
diff --git a/desktop/lxqt/lxqt-wallet/pspec.xml b/desktop/lxqt/lxqt-wallet/pspec.xml
index a928d0986e..f93744c674 100644
--- a/desktop/lxqt/lxqt-wallet/pspec.xml
+++ b/desktop/lxqt/lxqt-wallet/pspec.xml
@@ -1,6 +1,5 @@
-
 <?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>lxqt-wallet</Name>
diff --git a/desktop/lxqt/menu-cache/pspec.xml b/desktop/lxqt/menu-cache/pspec.xml
index d85f03c7cd..9391e6e328 100644
--- a/desktop/lxqt/menu-cache/pspec.xml
+++ b/desktop/lxqt/menu-cache/pspec.xml
@@ -1,4 +1,5 @@
-
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>menu-cache</Name>
diff --git a/desktop/lxqt/qlipper/pspec.xml b/desktop/lxqt/qlipper/pspec.xml
index 29ebc2ab70..3dddb7fac9 100644
--- a/desktop/lxqt/qlipper/pspec.xml
+++ b/desktop/lxqt/qlipper/pspec.xml
@@ -1,4 +1,5 @@
-
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>qlipper</Name>
diff --git a/desktop/toolkit/wxGTK2.8/pspec.xml b/desktop/toolkit/wxGTK2.8/pspec.xml
index 60caafd7f9..c5e5356ab8 100644
--- a/desktop/toolkit/wxGTK2.8/pspec.xml
+++ b/desktop/toolkit/wxGTK2.8/pspec.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
diff --git a/game/fps/alienarena/pspec.xml b/game/fps/alienarena/pspec.xml
index f2a4a3d028..43dc67fb2f 100644
--- a/game/fps/alienarena/pspec.xml
+++ b/game/fps/alienarena/pspec.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
diff --git a/game/misc/ode/pspec.xml b/game/misc/ode/pspec.xml
index 7bc2e51f0d..0bda327c68 100644
--- a/game/misc/ode/pspec.xml
+++ b/game/misc/ode/pspec.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
diff --git a/kernel/drivers/module-fglrx/pspec.xml b/kernel/drivers/module-fglrx/pspec.xml
index 437e1603a4..2d12cc2513 100644
--- a/kernel/drivers/module-fglrx/pspec.xml
+++ b/kernel/drivers/module-fglrx/pspec.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
diff --git a/office/dictionary/stardict-essential-turkish/pspec.xml b/office/dictionary/stardict-essential-turkish/pspec.xml
index 2cf892e7e3..760bd7477d 100644
--- a/office/dictionary/stardict-essential-turkish/pspec.xml
+++ b/office/dictionary/stardict-essential-turkish/pspec.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
diff --git a/office/misc/libgxps/pspec.xml b/office/misc/libgxps/pspec.xml
index 981ae340d0..2cffd9ea9e 100644
--- a/office/misc/libgxps/pspec.xml
+++ b/office/misc/libgxps/pspec.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
diff --git a/science/gis/libspatialite/pspec.xml b/science/gis/libspatialite/pspec.xml
index 26d35d9e32..70b4dca39b 100644
--- a/science/gis/libspatialite/pspec.xml
+++ b/science/gis/libspatialite/pspec.xml
@@ -1,4 +1,4 @@
-?xml version="1.0" ?>
+<?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
diff --git a/science/mathematics/rkward/pspec.xml b/science/mathematics/rkward/pspec.xml
index 9631d0189a..e91cd9cb60 100755
--- a/science/mathematics/rkward/pspec.xml
+++ b/science/mathematics/rkward/pspec.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
diff --git a/system/boot/gfxtheme-pisilinux-install/pspec.xml b/system/boot/gfxtheme-pisilinux-install/pspec.xml
index 4e3d162724..9dada0c89f 100644
--- a/system/boot/gfxtheme-pisilinux-install/pspec.xml
+++ b/system/boot/gfxtheme-pisilinux-install/pspec.xml
@@ -3,7 +3,7 @@
 <PISI>
     <Source>
         <Name>gfxtheme-pisilinux-install</Name>
-        <Homepage>www.pisilinux.org</Homepage>
+        <Homepage>https://pisilinux.org</Homepage>
         <Packager>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
@@ -66,4 +66,4 @@
             <Email>kaptan@pisilinux.org</Email>
         </Update>
     </History>
-</PISI>
\ No newline at end of file
+</PISI>
diff --git a/x11/im/scim/pspec.xml b/x11/im/scim/pspec.xml
index e8edc42034..52cfb9ca58 100644
--- a/x11/im/scim/pspec.xml
+++ b/x11/im/scim/pspec.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
diff --git a/x11/library/glew/pspec.xml b/x11/library/glew/pspec.xml
index 8e15774e5b..0be282b420 100755
--- a/x11/library/glew/pspec.xml
+++ b/x11/library/glew/pspec.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
diff --git a/x11/library/libXxf86vm/pspec.xml b/x11/library/libXxf86vm/pspec.xml
index af9e7e3d44..177bb37704 100644
--- a/x11/library/libXxf86vm/pspec.xml
+++ b/x11/library/libXxf86vm/pspec.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
diff --git a/x11/misc/xbitmaps/pspec.xml b/x11/misc/xbitmaps/pspec.xml
index 1bb1ecc235..8aba53ae6a 100644
--- a/x11/misc/xbitmaps/pspec.xml
+++ b/x11/misc/xbitmaps/pspec.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
diff --git a/x11/misc/xorg-app/pspec.xml b/x11/misc/xorg-app/pspec.xml
index b8557cc602..72b5ead2d6 100644
--- a/x11/misc/xorg-app/pspec.xml
+++ b/x11/misc/xorg-app/pspec.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
diff --git a/x11/misc/xorg-font/pspec.xml b/x11/misc/xorg-font/pspec.xml
index c33eddea2e..dfb8e7991a 100644
--- a/x11/misc/xorg-font/pspec.xml
+++ b/x11/misc/xorg-font/pspec.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
diff --git a/x11/terminal/yakuake/pspec.xml b/x11/terminal/yakuake/pspec.xml
index e95c8ebef1..f198c1cbfe 100644
--- a/x11/terminal/yakuake/pspec.xml
+++ b/x11/terminal/yakuake/pspec.xml
@@ -1,10 +1,9 @@
-
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>yakuake</Name>
-        <Homepage>http://extragear.kde.org/apps/yakuake</Homepage>
+        <Homepage>https://kde.org/applications/system/org.kde.yakuake/</Homepage>
         <Packager>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
diff --git a/x11/util/alternatives/pspec.xml b/x11/util/alternatives/pspec.xml
index 848476cceb..9062887afa 100644
--- a/x11/util/alternatives/pspec.xml
+++ b/x11/util/alternatives/pspec.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
diff --git a/x11/wm/openbox/pspec.xml b/x11/wm/openbox/pspec.xml
index 53fdb7b2af..dea238dfcd 100644
--- a/x11/wm/openbox/pspec.xml
+++ b/x11/wm/openbox/pspec.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>