diff --git a/net-misc/gerbera/gerbera-1.7.0~git.recipe b/net-misc/gerbera/gerbera-1.8.0~git.recipe
similarity index 87%
rename from net-misc/gerbera/gerbera-1.7.0~git.recipe
rename to net-misc/gerbera/gerbera-1.8.0~git.recipe
index 27eb6b754..d243991e8 100644
--- a/net-misc/gerbera/gerbera-1.7.0~git.recipe
+++ b/net-misc/gerbera/gerbera-1.8.0~git.recipe
@@ -1,13 +1,15 @@
-SUMMARY="Open source UPnP Media Server"
-DESCRIPTION="MediaTomb is an open source UPnP MediaServer"
-HOMEPAGE="https://sourceforge.net/projects/mediatomb/"
+SUMMARY="A UPnP Media Server"
+DESCRIPTION="Gerbera is a UPnP media server which allows you to stream \
+your digital media through your home network and consume it on a variety of \
+UPnP compatible devices."
+HOMEPAGE="https://docs.gerbera.io"
 COPYRIGHT="2005-2010 Gena Batyan, Sergey 'Jin' Bostandzhyan, Leonhard Wimmer
 	2020-2021 Gerbera Contributors"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="dd8caf36a7ac0806ed347237eea21c6f86b03e4d"
+srcGitRev="70acc42ecaac628d4fe16a6963466773cc4c4124"
 SOURCE_URI="https://github.com/gerbera/gerbera/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="3a9843db7993affc358ea6943b7c19baca7d26474af235b872c028d1920ae254"
+CHECKSUM_SHA256="5ad95461569a6a3c762b7cb3ed9aafc7b430e73df06751b3da337dfafb7b038d"
 SOURCE_DIR="gerbera-$srcGitRev"
 SOURCE_FILENAME="gerbera-$srcGitRev.tar.gz"
 PATCHES="gerbera-$portVersion.patchset"
@@ -17,7 +19,7 @@ ADDITIONAL_FILES="
 	"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
 
 commandSuffix=$secondaryArchSuffix
 commandBinDir=$binDir
diff --git a/net-misc/gerbera/patches/gerbera-1.4.0.patchset b/net-misc/gerbera/patches/gerbera-1.4.0.patchset
deleted file mode 100644
index d9da655f7..000000000
--- a/net-misc/gerbera/patches/gerbera-1.4.0.patchset
+++ /dev/null
@@ -1,106 +0,0 @@
-From 3eb36adbc1efdfb932b9d9f3149a985c94d56bf3 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sun, 16 Feb 2020 15:41:59 +0000
-Subject: Fix undeclared SIOCGIFADDR
-
-
-diff --git a/src/tools.cc b/src/tools.cc
-index 6dec392..621e57a 100644
---- a/src/tools.cc
-+++ b/src/tools.cc
-@@ -51,6 +51,10 @@
- #include <uuid/uuid.h>
- #endif
- 
-+#ifdef __HAIKU__
-+#include <sys/sockio.h>
-+#endif
-+
- #ifdef SOLARIS
- #include <fcntl.h>
- #include <sys/sockio.h>
--- 
-2.24.1
-
-
-From 6991c39bb5631a7a5bcbd22962202ced74fea883 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sun, 16 Feb 2020 16:19:26 +0000
-Subject: Fix install paths
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8089f09..63101b5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -33,6 +33,10 @@ set(WITH_LASTFM         0 CACHE BOOL "Enable LastFM")
- set(WITH_DEBUG          1 CACHE BOOL "Enables debug logging")
- set(WITH_TESTS          0 CACHE BOOL "Enables Unit Tests")
- 
-+set(CMAKE_INSTALL_BINDIR=bin)
-+set(CMAKE_INSTALL_DATADIR=share/gerbera)
-+set(CMAKE_INSTALL_MANDIR=share/man/man1)
-+
- set(libgerberaFILES
-         src/action_request.cc
-         src/action_request.h
-@@ -600,12 +604,12 @@ if(WITH_TESTS)
-     endif()
- endif()
- 
--INSTALL(TARGETS gerbera DESTINATION bin)
--INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/scripts/js DESTINATION share/gerbera)
--INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/web DESTINATION share/gerbera)
-+INSTALL(TARGETS gerbera DESTINATION ${CMAKE_INSTALL_BINDIR})
-+INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/scripts/js DESTINATION ${CMAKE_INSTALL_DATADIR})
-+INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/web DESTINATION ${CMAKE_INSTALL_DATADIR})
- INSTALL(FILES
-         ${PROJECT_SOURCE_DIR}/config/mappings.xml
-         ${PROJECT_SOURCE_DIR}/config/mysql.sql
-         ${PROJECT_SOURCE_DIR}/config/sqlite3.sql
--        DESTINATION share/gerbera)
--INSTALL(FILES ${PROJECT_SOURCE_DIR}/doc/gerbera.1 DESTINATION share/man/man1)
-+        DESTINATION ${CMAKE_INSTALL_DATADIR})
-+INSTALL(FILES ${PROJECT_SOURCE_DIR}/doc/gerbera.1 DESTINATION ${CMAKE_INSTALL_MANDIR})
--- 
-2.24.1
-
-
-From c4f5ab5ae115f71b920a90d6f75c27398a5003c5 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sat, 22 Feb 2020 17:21:21 +0100
-Subject: Fix linking to -lnetwork
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 63101b5..c2417d1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -408,14 +408,22 @@ if (HAVE_SETLOCALE)
- endif()
- 
- # Link to the socket library if it exists. This is something you need on Solaris/OmniOS/Joyent
--find_library(SOCKET_LIBRARY socket)
-+if(HAIKU)
-+    find_library(SOCKET_LIBRARY network)
-+else()
-+    find_library(SOCKET_LIBRARY socket)
-+endif()
- if(SOCKET_LIBRARY)
-     set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${SOCKET_LIBRARY})
-     target_link_libraries(gerbera ${SOCKET_LIBRARY})
- endif()
- 
- # Link to libnsl (Network services library) if it exists. This is something you need on Solaris/OmniOS/Joyent
--find_library(NSL_LIBRARY nsl)
-+if(HAIKU)
-+    find_library(NSL_LIBRARY network)
-+else()
-+    find_library(NSL_LIBRARY nsl)
-+endif()
- if(NSL_LIBRARY)
-     set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${NSL_LIBRARY})
-     target_link_libraries(gerbera ${NSL_LIBRARY})
--- 
-2.24.1
-
diff --git a/net-misc/gerbera/patches/gerbera-1.7.0~git.patchset b/net-misc/gerbera/patches/gerbera-1.8.0~git.patchset
similarity index 100%
rename from net-misc/gerbera/patches/gerbera-1.7.0~git.patchset
rename to net-misc/gerbera/patches/gerbera-1.8.0~git.patchset