diff --git a/castget/port-to-taglib.patch b/castget/port-to-taglib.patch
index 5940df16a..1c7f00467 100644
--- a/castget/port-to-taglib.patch
+++ b/castget/port-to-taglib.patch
@@ -1472,18 +1472,6 @@ index 74d1b25..e688001 100644
  
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
-@@ -21,9 +21,10 @@
- #include "config.h"
- #endif /* HAVE_CONFIG_H */
- 
--#include <string.h>
- #include "libxmlutil.h"
- 
-+#include <string.h>
-+
- char *libxmlutil_dup_attr(const xmlNode *node, const char *name)
- {
-   xmlChar *s;
 @@ -81,8 +82,10 @@ int libxmlutil_count_by_tag_name(const xmlNode *node, const char *name)
    return n;
  }
@@ -1636,41 +1624,6 @@ diff --git a/src/progress.c b/src/progress.c
 index 39afaca..b4f9a24 100644
 --- a/src/progress.c
 +++ b/src/progress.c
-@@ -1,5 +1,5 @@
- /*
--  Copyright (C) 2013-2016 Marius L. Jøhndal
-+  Copyright (C) 2013-2020 Marius L. Jøhndal
- 
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-@@ -21,18 +21,18 @@
- #include "config.h"
- #endif /* HAVE_CONFIG_H */
- 
--#include <stdio.h>
--#include <string.h>
--#include <stdlib.h>
--#include <math.h>
--#include <glib.h>
- #include "progress.h"
- 
--/* This code was inspired/guided by the progress-bar implementation found in
-- * curl (src/tool_cb_prg.c) by Daniel Stenberg, in turn building on an
-- * implementation by Lars Aas. */
-+#include <glib.h>
-+#include <math.h>
-+#include <stdlib.h>
-+#include <string.h>
- 
--int progress_bar_cb(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow)
-+/* This code was inspired/guided by the progress-bar implementation found in
-+   curl (src/tool_cb_prg.c) by Daniel Stenberg, in turn building on an
-+   implementation by Lars Aas. */
-+int progress_bar_cb(void *clientp, double dltotal, double dlnow, double ultotal,
-+                    double ulnow)
- {
-   double fraction;
-   int num;
 @@ -55,7 +55,7 @@ int progress_bar_cb(void *clientp, double dltotal, double dlnow, double ultotal,
        total = (long)dltotal + pb->resume_from;
        position = MIN((long)dlnow + pb->resume_from, total);
@@ -1724,13 +1677,6 @@ diff --git a/src/progress.h b/src/progress.h
 index 18910f7..0d43d48 100644
 --- a/src/progress.h
 +++ b/src/progress.h
-@@ -1,5 +1,5 @@
- /*
--  Copyright (C) 2005-2016 Marius L. Jøhndal
-+  Copyright (C) 2005-2020 Marius L. Jøhndal
- 
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
 @@ -20,6 +20,8 @@
  #ifndef PROGRESS_H
  #define PROGRESS_H
@@ -1740,15 +1686,6 @@ index 18910f7..0d43d48 100644
  typedef struct _progress_bar {
    FILE *f;
    long resume_from;
-@@ -30,6 +32,7 @@ typedef struct _progress_bar {
- 
- progress_bar *progress_bar_new(long resume_from);
- void progress_bar_free(progress_bar *pb);
--int progress_bar_cb(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow);
-+int progress_bar_cb(void *clientp, double dltotal, double dlnow, double ultotal,
-+                    double ulnow);
- 
- #endif /* PROGRESS_H */
 diff --git a/src/rss.c b/src/rss.c
 index 7c795e2..5eae5aa 100644
 --- a/src/rss.c
diff --git a/castget/riscv64.patch b/castget/riscv64.patch
index 7c659d00e..b1c68b535 100644
--- a/castget/riscv64.patch
+++ b/castget/riscv64.patch
@@ -1,30 +1,35 @@
-diff --git PKGBUILD PKGBUILD
-index 4747190..34ddc6a 100644
 --- PKGBUILD
 +++ PKGBUILD
-@@ -8,16 +8,22 @@ pkgdesc="Command-line based RSS enclosure downloader primarily intended for down
+@@ -8,17 +8,20 @@ pkgdesc="Command-line based RSS enclosure downloader primarily intended for down
  arch=('x86_64')
  url="https://johndal.com/castget/"
- license=('GPL')
+ license=('GPL-2.0-or-later' 'LGPL-2.1-or-later')
 -depends=('glib2' 'libxml2' 'curl' 'id3lib')
 +depends=('glib2' 'libxml2' 'curl' 'taglib')
 +makedepends=('ruby-ronn-ng')
  changelog=$pkgname.changelog
--source=(https://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2{,.sig})
-+source=(https://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2{,.sig}
-+        port-to-taglib.patch) # https://github.com/mlj/castget/commit/6ad0c9d791f646e310b733a9d4d4f7797e92c79c.patch
+ source=(
+   "https://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2"
+   "https://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2.sig"
+   "fix-build.patch"
++  "port-to-taglib.patch"
+ )
+ sha256sums=(
+   '438b5f7ec7e31a45ed3756630fe447f42015acda53ec09202f48628726b5e875'
+   'SKIP'
+   '48cce3303601ee28e06bdf6b55b7c5023405cacd7c913f8bc6616b3277395b80'
++  '51b690cf0f2ec8526e1ebc14fb01ae537ce8acf8c176b9487c008b3d83b32e8c'  
+ )
  validpgpkeys=('561BCBC3DF8A53503A62416EA7DE43E1D881FF60') # Marius Larsen Jøhndal <mariuslj@ifi.uio.no>
- sha256sums=('438b5f7ec7e31a45ed3756630fe447f42015acda53ec09202f48628726b5e875'
--            'SKIP')
-+            'SKIP'
-+            '3e8e812983cc527983e1610eff24227c35d405c12df069d8be27ce0b01d44692')
  
+@@ -33,6 +36,10 @@ prepare() {
  build() {
    cd "${srcdir}"/$pkgname-$pkgver
  
 +  patch -Np1 -i ../port-to-taglib.patch
-+  
++
 +  autoreconf -fi
++
    ./configure --prefix=/usr
    make
  }