diff --git a/aur/owncloud/owncloud.install b/aur/owncloud/owncloud.install
deleted file mode 100644
index 1ce38c291..000000000
--- a/aur/owncloud/owncloud.install
+++ /dev/null
@@ -1,13 +0,0 @@
-pkgname=ownCloud
-
-post_install() {
-   echo "Uncomment extensions gd.so intl.so iconv.so openssl.so xmlrpc.so zip.so"
-   echo "and either pdo_sqlite.so sqlite3.so (for the SQLite backend), pdo_pgsql.so pgsql.so (for the PostgreSQL backend) or mysqli.so pdo_mysql.so (for the MySQL backend)"
-   echo "in /etc/php/php.ini"
-   echo
-   echo "If using Apache, copy /etc/webapps/owncloud/apache.example.conf to /etc/httpd/conf/extra/owncloud.conf"
-   echo "and add the following lines into /etc/httpd/conf/httpd.conf:"
-   echo "Include /etc/httpd/conf/extra/owncloud.conf"
-   echo "LoadModule php5_module modules/libphp5.so"
-   echo "Include conf/extra/php5_module.conf"
-}
diff --git a/aur/owncloud/PKGBUILD b/community/owncloud/PKGBUILD
similarity index 58%
rename from aur/owncloud/PKGBUILD
rename to community/owncloud/PKGBUILD
index 588a93cef..4e2eef127 100644
--- a/aur/owncloud/PKGBUILD
+++ b/community/owncloud/PKGBUILD
@@ -1,40 +1,47 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Antonio Rojas <nqn1976 @ gmail.com>
 # Based on owncloud-git PKGBUILD by Alexander Ovsyannikov
 
-# ALARM Maintainer: Tommaso Sardelli <lacapannadelloziotom [at] gmail [dot] com>
+# Remove when bumped upstream.
 
 pkgname=owncloud
 pkgver=6.0.0.a
 _pkgver=6.0.0a
-pkgrel=1
+pkgrel=2
 pkgdesc="A cloud server to store your files centrally on a hardware controlled by you"
 arch=('any')
 url="http://owncloud.org/"
 license=('GPL')
 depends=('php-gd' 'php-intl')
-optdepends=('php-apache: to use the Apache web server' 'php-sqlite: to use the SQLite database backend' 'php-pgsql: to use the PostgreSQL 
-database backend' 'mariadb: to use the MySQL database backend' 'smbclient: to mount SAMBA shares' 'php-mcrypt' 'php-imagick: file preview' 
-'ffmpeg: file preview' 'libreoffice-common: file preview')
+optdepends=('php-apache: to use the Apache web server'
+	    'php-sqlite: to use the SQLite database backend'
+	    'php-pgsql: to use the PostgreSQL database backend'
+	    'mariadb: to use the MySQL database backend'
+	    'smbclient: to mount SAMBA shares'
+	    'php-mcrypt'
+	    'php-imagick: file preview'
+	    'ffmpeg: file preview'
+	    'libreoffice-common: file preview')
 makedepends=()
-source=("http://download.owncloud.org/community/$pkgname-$_pkgver.tar.bz2" 'apache.example.conf')
+options=('!strip')
+source=("http://download.owncloud.org/community/$pkgname-$_pkgver.tar.bz2"
+	'apache.example.conf')
 backup=('etc/webapps/owncloud/apache.example.conf')
-install=owncloud.install
 md5sums=('63c2913aa8382f695d7ade5ad11e51b2'
          'c1d49a3c0d8433bed6bffcd21ebb0064')
 
-
-package() { 
-# install license
+package() {
+  # install license
   install -d $pkgdir/usr/share/licenses/$pkgname
   cp $srcdir/$pkgname/COPYING-* $pkgdir/usr/share/licenses/$pkgname
 
-# install project  
-  install -d $pkgdir/usr/share/webapps/ 
+  # install project
+  install -d $pkgdir/usr/share/webapps/
   cp -a $srcdir/$pkgname $pkgdir/usr/share/webapps/
   chown -R http:http $pkgdir/usr/share/webapps/owncloud/{apps,config}
- 
-# install apache config file
+
+  # install apache config file
   install -d  $pkgdir/etc/webapps/$pkgname
   install -m 644 $srcdir/apache.example.conf  $pkgdir/etc/webapps/$pkgname
 }
-
diff --git a/aur/owncloud/apache.example.conf b/community/owncloud/apache.example.conf
similarity index 100%
rename from aur/owncloud/apache.example.conf
rename to community/owncloud/apache.example.conf