diff --git a/package/public/gphoto/gphoto.desc b/package/public/gphoto/gphoto.desc
index c4acd61c5..39746e190 100644
--- a/package/public/gphoto/gphoto.desc
+++ b/package/public/gphoto/gphoto.desc
@@ -34,7 +34,7 @@
 [S] Stable
 [C] extra/office
 
-[V] 2.1.99
+[V] 2.2.0
 [P] X -?---5---9 213.900
 
-[D] 51266773 gphoto2-2.1.99.tar.bz2 http://dl.sourceforge.net/sourceforge/gphoto/
+[D] 3250612901 gphoto2-2.2.0.tar.bz2 http://dl.sourceforge.net/sourceforge/gphoto/
diff --git a/package/public/libgphoto/include-dirs.patch b/package/public/libgphoto/include-dirs.patch
new file mode 100644
index 000000000..c48ebaa1b
--- /dev/null
+++ b/package/public/libgphoto/include-dirs.patch
@@ -0,0 +1,13 @@
+--- libgphoto2-2.2.0/packaging/generic/print-camera-list.c	2006-04-19 03:54:05.000000000 +0200
++++ src.libgphoto.1153750864.1429.4123974939/libgphoto2-2.2.0/packaging/generic/print-camera-list.c	2006-07-24 16:43:55.000000000 +0200
+@@ -48,8 +48,8 @@
+ #include <time.h>
+ #include <string.h>
+ 
+-#include <gphoto2/gphoto2-camera.h>
+-#include <gphoto2/gphoto2-port-log.h>
++#include <libgphoto2/gphoto2-camera.h>
++#include <libgphoto2_port/gphoto2-port-log.h>
+ 
+ #ifndef TRUE
+ #define TRUE  (0==0)
diff --git a/package/public/libgphoto/libgphoto.desc b/package/public/libgphoto/libgphoto.desc
index 83d8bbb7f..cb2187d80 100644
--- a/package/public/libgphoto/libgphoto.desc
+++ b/package/public/libgphoto/libgphoto.desc
@@ -34,6 +34,6 @@
 [S] Stable
 [C] base/library
 
-[V] 2.1.99
+[V] 2.2.0
 [P] X -?---5---9 157.800
-[D] 1016061120 libgphoto2-2.1.99.tar.gz http://dl.sourceforge.net/sourceforge/gphoto/
+[D] 3908034344 libgphoto2-2.2.0.tar.gz http://dl.sourceforge.net/sourceforge/gphoto/