diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index a548254..b35267a 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -5,22 +5,23 @@ pkgver=3.3.2
 pkgrel=1
 pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..."
 url="https://www.opensips.org"
-depends=('gcc-libs' 'openssl' 'db' 'attr' 'libxml2')
-makedepends=('postgresql-libs>=8.4.1' 'unixodbc' 'libldap>=2.4.18' 'libmariadbclient'
-	     'lynx' 'libxslt' 'libmicrohttpd')
-optdepends=('postgresql-libs'
-	    'unixodbc'
-	    'libldap'
-	    'mariadb-libs'
-	    'libsasl'
-	    'pcre')
+depends=('gcc-libs')
+makedepends=('libldap' 'libmariadbclient' 'libmicrohttpd' 'libxml2' 'libxslt'
+             'lynx' 'openssl' 'postgresql-libs' 'unixodbc')
+optdepends=('curl: db_http module'
+            'libldap: ldap module'
+            'libmicrohttpd: httpd module'
+            'libxml2: presence module'
+            'mariadb-libs: db_mysql module'
+            'openssl: tls_openssl module'
+            'postgresql-libs'
+            'unixodbc: db_unixodbc module')
 backup=("etc/opensips/opensips.cfg"
 	"etc/opensips/osipsconsolerc"
 	"etc/opensips/opensipsctlrc")
 arch=('x86_64')
 license=('GPL')
-install=opensips.install
-options=('!emptydirs' 'zipman' '!makeflags' 'docs')
+options=('!emptydirs' '!makeflags')
 source=(https://opensips.org/pub/opensips/${pkgver}/opensips-${pkgver}.tar.gz
 	opensips.service)
 sha256sums=('54d5a24adbba0affc3c0f2cc7a5c8793d7c6cb9bf2df45ab665f260f20ccba89'
@@ -28,19 +29,15 @@ sha256sums=('54d5a24adbba0affc3c0f2cc7a5c8793d7c6cb9bf2df45ab665f260f20ccba89'
 
 prepare() {
   cd "$srcdir"/$pkgname-$pkgver/
-
-#  patch -p1 -i "$srcdir"/38242d6fe7491ea5de900e9ae45e3902edd1a67f.patch
-  sed -i 's|sbin|bin|g' Makefile
-  sed -i 's|bin-dir = sbin/|bin-dir = bin/|' Makefile.defs
 }
 
-_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350 proto_tls tlsops tls_mgm db_http httpd tm rr"
+_modules="db_http db_mysql db_postgres db_unixodbc h350 httpd ldap presence presence_xml proto_tls tls_mgm tls_openssl tm rr"
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver/
 
   make \
-	include_modules="${_modules}" \
+	include_modules="${_modules}" bin_dir=bin/ cfg_target=/etc/$pkgname/ \
 	LIBDIR=lib PREFIX=/usr
 }
 
@@ -48,22 +45,8 @@ package() {
   cd "$srcdir"/$pkgname-$pkgver/
 
   make \
-	include_modules="${_modules}" \
+	include_modules="${_modules}" bin_dir=bin/ cfg_target=/etc/$pkgname/ cfg_prefix="$pkgdir" \
 	BASEDIR="$pkgdir" PREFIX=/usr LIBDIR=lib install
 
-  # Conforms to the arch packaging standards (https://wiki.archlinux.org/index.php/Arch_Packaging_Standards)
-  mkdir -p "$pkgdir"/etc/
-  mv "$pkgdir"/usr/etc/opensips/ "$pkgdir"/etc/
-  sed -i 's#mpath=".*lib/opensips/modules/"#mpath="/usr/lib/opensips/modules/"#' "$pkgdir"/etc/opensips/opensips.cfg
-
-  # fix bad paths
-  cd "$pkgdir"/usr/share
-  find -type f -exec sed -i "s#"$pkgdir"##" {} \;
-
-  mv "$pkgdir"/usr/sbin "$pkgdir"/usr/bin
-
-  cd "$pkgdir"/etc
-  find -type f -exec sed -i "s#"$pkgdir"##" {} \;
-
   install -Dm0644 "$srcdir"/$pkgname.service "$pkgdir"/usr/lib/systemd/system/$pkgname.service
 }
diff --git a/trunk/opensips.install b/trunk/opensips.install
deleted file mode 100644
index 96fddae..0000000
--- a/trunk/opensips.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_install() {
-  echo "To use MySQL, you should install mysql package and run 'opensipsdbctl create'"
-}