diff --git a/system/base/dbus-glib/pspec.xml b/system/base/dbus-glib/pspec.xml
index d76853c2..7f879655 100644
--- a/system/base/dbus-glib/pspec.xml
+++ b/system/base/dbus-glib/pspec.xml
@@ -1,9 +1,9 @@
 <?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>dbus-glib</Name>
-        <Homepage>http://dbus.freedesktop.org/</Homepage>
+        <Homepage>https://www.freedesktop.org/wiki/Software/dbus/</Homepage>
         <Packager>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
diff --git a/system/base/dbus-python/pspec.xml b/system/base/dbus-python/pspec.xml
index 606aa15e..19e8a26a 100644
--- a/system/base/dbus-python/pspec.xml
+++ b/system/base/dbus-python/pspec.xml
@@ -1,9 +1,9 @@
 <?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>dbus-python</Name>
-        <Homepage>http://dbus.freedesktop.org/</Homepage>
+        <Homepage>https://www.freedesktop.org/wiki/Software/dbus/</Homepage>
         <Packager>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
diff --git a/system/base/dbus/pspec.xml b/system/base/dbus/pspec.xml
index df053f27..f3ced808 100644
--- a/system/base/dbus/pspec.xml
+++ b/system/base/dbus/pspec.xml
@@ -1,9 +1,9 @@
 <?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>dbus</Name>
-        <Homepage>http://dbus.freedesktop.org/</Homepage>
+        <Homepage>https://www.freedesktop.org/wiki/Software/dbus/</Homepage>
         <Packager>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
diff --git a/system/base/libbsd/pspec.xml b/system/base/libbsd/pspec.xml
index f2917ad7..9c6fd605 100644
--- a/system/base/libbsd/pspec.xml
+++ b/system/base/libbsd/pspec.xml
@@ -1,7 +1,7 @@
 <PISI>
     <Source>
         <Name>libbsd</Name>
-        <Homepage>http://libbsd.freedesktop.org</Homepage>
+        <Homepage>https://libbsd.freedesktop.org/wiki/</Homepage>
         <Packager>
             <Name>Marcin Bojara</Name>
             <Email>marcin@pisilinux.org</Email>
@@ -37,10 +37,9 @@
             <Path fileType="man">/usr/share/man/man7</Path>
         </Files>
     </Package>
-	
 
     <History>
-		<Update release="6">
+        <Update release="6">
             <Date>2019-12-26</Date>
             <Version>0.10.0</Version>
             <Comment>Version Bump</Comment>
diff --git a/system/base/perl-Locale-gettext/pspec.xml b/system/base/perl-Locale-gettext/pspec.xml
index f41448ec..fe04d5d0 100644
--- a/system/base/perl-Locale-gettext/pspec.xml
+++ b/system/base/perl-Locale-gettext/pspec.xml
@@ -1,9 +1,9 @@
 <?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>perl-Locale-gettext</Name>
-        <Homepage>http://search.cpan.org/dist/gettext</Homepage>
+        <Homepage>https://metacpan.org/pod/Locale::gettext</Homepage>
         <Packager>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
@@ -32,7 +32,7 @@
     </Package>
 
     <History>
-		<Update release="5">
+        <Update release="5">
             <Date>2019-12-23</Date>
             <Version>1.07</Version>
             <Comment>Rebuild</Comment>
diff --git a/system/devel/libarchive/pspec.xml b/system/devel/libarchive/pspec.xml
index 329d9c92..c56c158f 100644
--- a/system/devel/libarchive/pspec.xml
+++ b/system/devel/libarchive/pspec.xml
@@ -1,9 +1,9 @@
 <?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>libarchive</Name>
-        <Homepage>http://code.google.com/p/libarchive/</Homepage>
+        <Homepage>https://www.libarchive.org/</Homepage>
         <Packager>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
@@ -60,7 +60,7 @@
     </Package>
 
     <History>
-		<Update release="7">
+        <Update release="7">
             <Date>2019-12-26</Date>
             <Version>3.4.0</Version>
             <Comment>Idris Kalp</Comment>
diff --git a/system/devel/perl-XML-Parser/pspec.xml b/system/devel/perl-XML-Parser/pspec.xml
index c203c153..11ed828f 100644
--- a/system/devel/perl-XML-Parser/pspec.xml
+++ b/system/devel/perl-XML-Parser/pspec.xml
@@ -1,9 +1,9 @@
 <?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>perl-XML-Parser</Name>
-        <Homepage>http://search.cpan.org/dist/XML-Parser/</Homepage>
+        <Homepage>https://metacpan.org/pod/XML::Parser</Homepage>
         <Packager>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
@@ -33,7 +33,7 @@
     </Package>
 
     <History>
-		<Update release="5">
+        <Update release="5">
             <Date>2019-12-23</Date>
             <Version>2.46</Version>
             <Comment>Version bump</Comment>