diff --git a/janus-gateway-git/.gitignore b/janus-gateway-git/.gitignore
new file mode 100644
index 0000000..e650075
--- /dev/null
+++ b/janus-gateway-git/.gitignore
@@ -0,0 +1,6 @@
+src/
+pkg/
+*.src.tar.*
+*.pkg.tar.*
+*.log
+janus-gateway/
diff --git a/janus-gateway-git/PKGBUILD b/janus-gateway-git/PKGBUILD
new file mode 100644
index 0000000..96d91e4
--- /dev/null
+++ b/janus-gateway-git/PKGBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Maurizio Porrato <maurizio.porrato@gmail.com>
+
+pkgname=janus-gateway-git
+pkgver=0.0.6.r87.g0881acc
+pkgrel=1
+pkgdesc="WebRTC gateway."
+arch=('i686' 'x86_64')
+url="http://janus.conf.meetecho.com/"
+license=('GPL3')
+depends=('libmicrohttpd' 'jansson' 'libnice' 'openssl' 'libsrtp' 'sofia-sip' 'sctp-refimpl-svn' 'libwebsock-nothreads' 'libevent' 'librabbitmq-c' 'opus' 'libogg' 'glib2' 'ding-libs') 
+makedepends=('git' 'libtool' 'automake' 'autoconf' 'gcc' 'make' 'pkg-config' 'gengetopt')
+provides=(janus-gateway)
+backup=('etc/janus/janus.cfg')
+install=janus-gateway-git.install
+
+source=('git+https://github.com/meetecho/janus-gateway.git'
+        'install-conf.patch')
+md5sums=('SKIP'
+         '17955203b7d06f5c887638e621d7b3c1')
+_gitname="janus-gateway"
+
+pkgver() {
+  cd "$srcdir/${_gitname}"
+  git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g;s/^v//'
+}
+
+prepare() {
+  cd "$srcdir/${_gitname}"
+  patch < "$startdir/install-conf.patch"
+}
+
+build() {
+  cd "$srcdir/${_gitname}"
+  ./autogen.sh
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-docs
+  DESTDIR="$pkgdir/" make
+}
+
+package() { 
+  cd "$srcdir/${_gitname}"
+  DESTDIR="$pkgdir/" make install configs
+  rm -f "$pkgdir/usr/share/janus/certs/mycert.{key,pem}"
+} 
+
diff --git a/janus-gateway-git/install-conf.patch b/janus-gateway-git/install-conf.patch
new file mode 100644
index 0000000..677882d
--- /dev/null
+++ b/janus-gateway-git/install-conf.patch
@@ -0,0 +1,10 @@
+--- Makefile.am.upstream	2014-12-21 12:31:15.401000516 +0000
++++ Makefile.am	2014-12-21 12:34:24.689975050 +0000
+@@ -264,5 +264,5 @@
+ ##
+ 
+ configs:
+-	$(MKDIR_P) $(confdir)
+-	$(foreach config,$(conf_DATA),cp "$(CURDIR)/$(config)" "$(confdir)/$(notdir $(basename $(config) .sample))";)
++	$(MKDIR_P) $(DESTDIR)$(confdir)
++	$(foreach config,$(conf_DATA),cp "$(CURDIR)/$(config)" "$(DESTDIR)$(confdir)/$(notdir $(basename $(config) .sample))";)
diff --git a/janus-gateway-git/janus-gateway-git.install b/janus-gateway-git/janus-gateway-git.install
new file mode 100644
index 0000000..465776f
--- /dev/null
+++ b/janus-gateway-git/janus-gateway-git.install
@@ -0,0 +1,10 @@
+post_install() {
+	openssl req -x509 -batch -nodes -newkey rsa:1024 \
+		-keyout /usr/share/janus/certs/mycert.key \
+		-out /usr/share/janus/certs/mycert.pem
+}
+
+pre_remove() {
+	rm -f /usr/share/janus/certs/mycert.{key,pem}
+}
+