diff --git a/hardware/misc/libgpod/actions.py b/hardware/misc/libgpod/actions.py
index 3a987e8752..a3c4bfb509 100644
--- a/hardware/misc/libgpod/actions.py
+++ b/hardware/misc/libgpod/actions.py
@@ -14,6 +14,7 @@ def setup():
--with-html-dir=/usr/share/doc/%s/html \
--with-temp-mount-dir=/run/libgpod \
--without-hal \
+ --with-python \
--without-mono \
--disable-gtk-doc \
--disable-static \
diff --git a/hardware/misc/libgpod/files/0001-323-Segmentation-fault-when-opening-ipod.patch b/hardware/misc/libgpod/files/0001-323-Segmentation-fault-when-opening-ipod.patch
new file mode 100644
index 0000000000..727f18b370
--- /dev/null
+++ b/hardware/misc/libgpod/files/0001-323-Segmentation-fault-when-opening-ipod.patch
@@ -0,0 +1,43 @@
+From 8dc5015ae036b219c4c9579a156886aa3a722aa5 Mon Sep 17 00:00:00 2001
+From: phantomjinx
+Date: Sat, 9 Aug 2014 19:57:10 +0100
+Subject: [PATCH] #323 Segmentation fault when opening ipod
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Patch submitted in bug report from François Melchior / James Burton
+---
+ src/itdb_itunesdb.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
+index 4cc771a..1e85476 100644
+--- a/src/itdb_itunesdb.c
++++ b/src/itdb_itunesdb.c
+@@ -1156,6 +1156,7 @@ static gboolean playcounts_plist_read (FImport *fimp, GValue *plist_data)
+ GHashTable *pc_dict, *track_dict;
+ GValue *to_parse;
+ GArray *array;
++ GValue value;
+ gint i;
+ guint32 mac_time;
+ guint64 *dbid;
+@@ -1175,11 +1176,12 @@ static gboolean playcounts_plist_read (FImport *fimp, GValue *plist_data)
+
+ array = (GArray*)g_value_get_boxed (to_parse);
+ for (i = 0; i < array->len; i++) {
+- if (!G_VALUE_HOLDS (g_array_index (array, GValue *, i), G_TYPE_HASH_TABLE)) {
++ value = g_array_index (array, GValue, i);
++ if (!G_VALUE_HOLDS (&value, G_TYPE_HASH_TABLE)) {
+ continue;
+ }
+
+- track_dict = g_value_get_boxed (g_array_index (array, GValue *, i));
++ track_dict = g_value_get_boxed (&value);
+ if (track_dict == NULL)
+ continue;
+
+--
+2.12.2
+
diff --git a/hardware/misc/libgpod/files/libgpod-0.8.2-pkgconfig_overlinking.patch b/hardware/misc/libgpod/files/libgpod-0.8.2-pkgconfig_overlinking.patch
new file mode 100644
index 0000000000..a5dafb2857
--- /dev/null
+++ b/hardware/misc/libgpod/files/libgpod-0.8.2-pkgconfig_overlinking.patch
@@ -0,0 +1,11 @@
+diff -up libgpod-0.8.2/libgpod-1.0.pc.in.pkgconfig_overlinking libgpod-0.8.2/libgpod-1.0.pc.in
+--- libgpod-0.8.2/libgpod-1.0.pc.in.pkgconfig_overlinking 2011-04-15 03:37:34.000000000 -0500
++++ libgpod-0.8.2/libgpod-1.0.pc.in 2012-08-10 13:53:00.294631805 -0500
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: libgpod
+ Description: A library to manipulate songs and playlists stored on an ipod
+ Version: @VERSION@
+-Requires: glib-2.0 >= 2.8.0 gobject-2.0 @GDKPIXBUF_REQ@ @LIBIMOBILEDEVICE_REQ@
++Requires.private: glib-2.0 >= 2.8.0 gobject-2.0 @GDKPIXBUF_REQ@ @LIBIMOBILEDEVICE_REQ@
+ Libs: -L${libdir} -lgpod
+ Cflags: -I${includedir}/gpod-1.0
diff --git a/hardware/misc/libgpod/files/libgpod-fixswig.patch b/hardware/misc/libgpod/files/libgpod-fixswig.patch
new file mode 100644
index 0000000000..23e49c5928
--- /dev/null
+++ b/hardware/misc/libgpod/files/libgpod-fixswig.patch
@@ -0,0 +1,14 @@
+--- libgpod-0.8.3/bindings/python/gpod.i.in 2015-02-12 08:43:11.058975384 +0100
++++ libgpod-0.8.3/bindings/python/gpod.i.in.orig 2015-02-12 08:44:08.185561253 +0100
+@@ -298,9 +298,11 @@ PyObject* sw_get_photo(GList *list, gint
+ %include "gpod_doc.i"
+ %include "@top_builddir@/config.h"
+
++/*
+ # be nicer to decode these utf8 strings into Unicode objects in the C
+ # layer. Here we are leaving it to the Python side, and just giving
+ # them utf8 encoded Strings.
++*/
+ typedef char gchar;
+
+ %typemap(in) time_t {
diff --git a/hardware/misc/libgpod/pspec.xml b/hardware/misc/libgpod/pspec.xml
index 497953cefd..993eb21d6f 100644
--- a/hardware/misc/libgpod/pspec.xml
+++ b/hardware/misc/libgpod/pspec.xml
@@ -26,7 +26,13 @@
sg3_utils-devel
libimobiledevice-devel
python-pygobject-devel
+ swig
+
+ 0001-323-Segmentation-fault-when-opening-ipod.patch
+ libgpod-0.8.2-pkgconfig_overlinking.patch
+ libgpod-fixswig.patch
+