diff --git a/curl/PKGBUILD b/curl/PKGBUILD
index 16ab4cc..03d7f7b 100644
--- a/curl/PKGBUILD
+++ b/curl/PKGBUILD
@@ -8,7 +8,7 @@
 pkgbase=curl
 pkgname=(curl libcurl-compat libcurl-gnutls)
 pkgver=7.85.0
-pkgrel=01
+pkgrel=02
 pkgdesc='An URL retrieval utility and library - w/o ipv6 & zstd'
 arch=('x86_64')
 url='https://curl.haxx.se'
@@ -16,6 +16,7 @@ url='https://curl.haxx.se'
 depends=('ca-certificates' 'brotli' 'libbrotlidec.so' 'krb5' 'libgssapi_krb5.so'
          'libidn2' 'libidn2.so' 'libnghttp2' 'libpsl' 'libpsl.so' 'libssh2' 'libssh2.so'
          'openssl' 'zlib')
+makedepends=('patchelf')
 provides=('libcurl.so')
 source=("https://curl.haxx.se/download/${pkgname}-${pkgver}.tar.gz"{,.asc})
 #        '0001-select-do-not-return-fatal-error-on-EINTR-from-poll.patch')
@@ -74,6 +75,7 @@ build() {
     --with-gnutls='/usr'
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make -C lib
+  patchelf --set-soname 'libcurl-gnutls.so.4' ./lib/.libs/libcurl.so
 }
 
 package_curl() {
@@ -98,6 +100,7 @@ package_libcurl-compat() {
 
   mv "${pkgdir}"/usr/lib/libcurl{,-compat}.so.4.8.0
   rm "${pkgdir}"/usr/lib/libcurl.{a,so}*
+  ln -s libcurl-gnutls.so.4 "${pkgdir}"/usr/lib/libcurl-gnutls.so
   for version in 3 4.0.0 4.1.0 4.2.0 4.3.0 4.4.0 4.5.0 4.6.0 4.7.0; do
     ln -s libcurl-compat.so.4.8.0 "${pkgdir}"/usr/lib/libcurl.so.${version}
   done
diff --git a/curl/PKGBUILD-arch b/curl/PKGBUILD-arch
index f0f8d1d..f6a4bb2 100644
--- a/curl/PKGBUILD-arch
+++ b/curl/PKGBUILD-arch
@@ -7,7 +7,7 @@
 pkgbase=curl
 pkgname=(curl libcurl-compat libcurl-gnutls)
 pkgver=7.85.0
-pkgrel=1
+pkgrel=2
 pkgdesc='An URL retrieval utility and library'
 arch=('x86_64')
 url='https://curl.haxx.se'
@@ -16,6 +16,7 @@ options=('debug')
 depends=('ca-certificates' 'brotli' 'libbrotlidec.so' 'krb5' 'libgssapi_krb5.so'
          'libidn2' 'libidn2.so' 'libnghttp2' 'libpsl' 'libpsl.so' 'libssh2' 'libssh2.so'
          'openssl' 'zlib' 'zstd' 'libzstd.so')
+makedepends=('patchelf')
 provides=('libcurl.so')
 source=("https://curl.haxx.se/download/${pkgname}-${pkgver}.tar.gz"{,.asc})
 sha512sums=('bbad693bcde9c55e5942499950d76011f53ad43d3270eee2c8db486bcf46f5fc92b32dd8752caf4c5976fe493d083e2d34fa299cb96fb8e76d8f5fcc2cc56a36'
@@ -68,6 +69,7 @@ build() {
     --with-gnutls='/usr'
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make -C lib
+  patchelf --set-soname 'libcurl-gnutls.so.4' ./lib/.libs/libcurl.so
 }
 
 package_curl() {
@@ -110,6 +112,7 @@ package_libcurl-gnutls() {
 
   mv "${pkgdir}"/usr/lib/libcurl{,-gnutls}.so.4.8.0
   rm "${pkgdir}"/usr/lib/libcurl.{a,so}*
+  ln -s libcurl-gnutls.so.4 "${pkgdir}"/usr/lib/libcurl-gnutls.so
   for version in 3 4 4.0.0 4.1.0 4.2.0 4.3.0 4.4.0 4.5.0 4.6.0 4.7.0; do
     ln -s libcurl-gnutls.so.4.8.0 "${pkgdir}"/usr/lib/libcurl-gnutls.so.${version}
   done
diff --git a/curl/deps b/curl/deps
index 139597f..887b47c 100644
--- a/curl/deps
+++ b/curl/deps
@@ -1,2 +1,3 @@
 
 
+patchelf
diff --git a/hwdata/PKGBUILD b/hwdata/PKGBUILD
index 7d5976a..1d1315d 100644
--- a/hwdata/PKGBUILD
+++ b/hwdata/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=hwdata
 pkgver=0.362
-pkgrel=01
+pkgrel=02
 pkgdesc="hardware identification databases"
 makedepends=('git')
 replaces=('hwids')
@@ -16,12 +16,18 @@ url=https://github.com/vcrhonek/hwdata
 arch=('any')
 source=("git+https://github.com/vcrhonek/hwdata.git#tag=v${pkgver}?signed")
 
-package() {
-  cd hwdata
+build() {
+  cd ${pkgname}
+  ./configure --prefix=/usr
+  make
+}
 
-  for ids in pci.ids pnp.ids usb.ids; do
-    install -Dm644 "$ids" "${pkgdir}/usr/share/hwdata/${ids}"
-  done
+package() {
+  cd ${pkgname}
+  make DESTDIR="${pkgdir}" install
+ 
+  # Do not package blacklist of kernel modules
+  rm -rf "${pkgdir}"/usr/lib/
 }
 
 #---- license gpg-key sha256sums ----
diff --git a/hwdata/PKGBUILD-arch b/hwdata/PKGBUILD-arch
index 843077d..551fcb9 100644
--- a/hwdata/PKGBUILD-arch
+++ b/hwdata/PKGBUILD-arch
@@ -1,7 +1,7 @@
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=hwdata
 pkgver=0.362
-pkgrel=1
+pkgrel=2
 pkgdesc="hardware identification databases"
 makedepends=('git')
 replaces=('hwids')
@@ -12,10 +12,16 @@ source=("git+https://github.com/vcrhonek/hwdata.git#tag=v${pkgver}?signed")
 validpgpkeys=('3C40194FB79138CE0F78FD4919C2F062574F5403') # Vitezslav Crhonek
 sha256sums=('SKIP')
 
-package() {
-  cd hwdata
-
-  for ids in pci.ids pnp.ids usb.ids; do
-    install -Dm644 "$ids" "${pkgdir}/usr/share/hwdata/${ids}"
-  done
+build() {
+  cd ${pkgname}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}
+  make DESTDIR="${pkgdir}" install
+
+  # Do not package blacklist of kernel modules
+  rm -rf "${pkgdir}"/usr/lib/
 }
diff --git a/hwdata/deps b/hwdata/deps
index f4099d9..8801eed 100644
--- a/hwdata/deps
+++ b/hwdata/deps
@@ -1,3 +1,4 @@
 git
 
 
+
diff --git a/ppp/PKGBUILD b/ppp/PKGBUILD
index 8e88b40..a5400ef 100644
--- a/ppp/PKGBUILD
+++ b/ppp/PKGBUILD
@@ -1,12 +1,13 @@
 #!/usr/bin/bash
 # JOBoRun		: Jwm OpenBox Obarun RUNit
-# Maintainer		: Joe Bo Run <joborun@disroot.org>
+# Maintainer	: Joe Bo Run <joborun@disroot.org>
 # PkgSource		: url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname"
+# Website		: https://pozol.eu
 #-----------------------------------------| DESCRIPTION |---------------------------------------
 
 pkgname=ppp
 pkgver=2.4.9
-pkgrel=01
+pkgrel=02
 pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking - no ipv6 w/o systemd"
 arch=(x86_64)
 url="https://www.samba.org/ppp/"
@@ -102,10 +103,9 @@ validpgpkeys=('631E179E370CD727A7F2A33A9E4295D605F66CE9'  # Paul Mackerras (Sign
 sha256sums=(f938b35eccde533ea800b15a7445b2f1137da7f88e32a16898d02dee8adc058d # ppp-2.4.9.tar.gz
 	9f5cc230f2b2d750135bee36ec8e3c86fbf76428b9fc66b11442c585c83398e6 # ppp-2.4.9.tar.gz.asc
 	91acaa378a052ac4fb0c3df20c4c5fcdb416ee437777d6668a946d27cf12ef5f # ppp-2.4.6-makefiles.patch
-	0933fecb9e0adaddd88ee1e049a5f3a0508e83b81dc1aa333df784e729ab4b6e # options
+	c74f0e09724b90d9fbdbb921b5d6f27812d650945d6d8015f4f06089f5562d9c # options
 	ddef42b2cc5d49e81556dc9dbacf5ee3bf8dc32704f3670c2233eed42c4a4efd # ip-up
 	658630ba4c5cb583df80af6d4df81df8ae20798f63cc4b9cec8d4dad13a6a897 # ip-down
 	aafb75b978aa13225444dc6b914fab324d686821be93c49e893800e647aa7648 # ip-up.d.dns.sh
 	17b486fa69a71dafcbe543dc4f2b8cb9ed31e675aabc5f6c98ef94dbc1561c85 # ip-down.d.dns.sh
 	96fd35104e3d0ec472517afecead88419913ae73ae0189476d5dad9029c2be42) #  LICENSE
-
diff --git a/ppp/PKGBUILD-arch b/ppp/PKGBUILD-arch
index dfab518..9b5ba5a 100644
--- a/ppp/PKGBUILD-arch
+++ b/ppp/PKGBUILD-arch
@@ -3,7 +3,7 @@
 
 pkgname=ppp
 pkgver=2.4.9
-pkgrel=1
+pkgrel=2
 pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking"
 arch=(x86_64)
 url="https://www.samba.org/ppp/"
@@ -25,7 +25,7 @@ source=(https://download.samba.org/pub/ppp/ppp-$pkgver.tar.gz{,.asc}
 sha512sums=('5721b1915f2d02b895508601120d09ff17a76cbab62cbcb7d0216837bdf84f10f345311b77f346b120bda3b488ae10d7d942c4d7d5f1e369d0a002f3071099f1'
             'SKIP'
             '90b6b7c40cece43ed90a69aa1a2fa11c23da85045105354e7440cdb0d059f9ea660b58bf9d3045e32ffb05a8e65ff3d5a101002ac1f48f3f608b1706d6bc5c81'
-            '86b13a9f02cc44c5ba16d404fdb54459fcda22fb5f4c4e12b2101e47e2650b62576d6315cd41f30f103ea61fb6f86b7aa2e7d40336f849f45061f7ad9c5119fe'
+            '4324a9abe79b20735b87de2158bb73b6449415a4760f06a06b648dfb53517f8d9907b094a88d1b492b24c8720cfd9b17d491fbe236fbd51ba9042af60483b231'
             'bdaaac792dd448ff31da6da2749d8c2f9c4e0311b1d4639de7c68038fcaa333cc28e25f5a6308de0ecb24b60b2e7284a811482df990da5f54d5581a746964f3c'
             '92f3a5e383f2c888938e891ba831042e7f8c026b0ddf5ce8c3523d06ac32fa81742e638a4c665975cbc79868b98806d92574ee2ee8e034e33b065a90ee3ab28b'
             '1636b2f8e3e0b0561aae9716e62c58cc7bee06aea0cdc163e64aba17da427810b7a12e4cea3d51b7a0b212fc2f4b7890f08d35d25165cd340b93241c9fe8842c'
diff --git a/ppp/deps b/ppp/deps
index 139597f..8b13789 100644
--- a/ppp/deps
+++ b/ppp/deps
@@ -1,2 +1 @@
 
-
diff --git a/ppp/options b/ppp/options
index 6369184..6069cf7 100644
--- a/ppp/options
+++ b/ppp/options
@@ -6,7 +6,7 @@
 # Modified for ArchLinux by Manolis Tzanidakis <manolis@archlinux.org>
 #
 # To quickly see what options are active in this file, use this command:
-#   egrep -v '#|^ *$' /etc/ppp/options
+#   grep -Ev '#|^ *$' /etc/ppp/options
 
 # Specify which DNS Servers the incoming Win95 or WinNT Connection should use
 # Two Servers can be remotely configured
diff --git a/ppp/time b/ppp/time
index e5359e1..eaefd45 100644
--- a/ppp/time
+++ b/ppp/time
@@ -1,4 +1,6 @@
-real	0m9.880s
-user	0m21.953s
-sys	0m1.489s
 
+
+real	0m19.808s
+user	0m16.243s
+sys	0m1.266s
+