diff --git a/community/marisa/PKGBUILD b/community/marisa/PKGBUILD
index da443b5c8..71313b1b4 100644
--- a/community/marisa/PKGBUILD
+++ b/community/marisa/PKGBUILD
@@ -5,14 +5,14 @@
 #  - remove --enable-sse2 from configure
 
 pkgbase=marisa
-pkgname=('marisa' 'perl-marisa' 'python2-marisa' 'ruby-marisa')
+pkgname=('marisa' 'perl-marisa' 'python-marisa' 'ruby-marisa')
 pkgver=0.2.5
-pkgrel=5
+pkgrel=7
 arch=('x86_64')
 url="https://github.com/s-yata/marisa-trie"
 license=('BSD' 'LGPL')
-makedepends=('python2' 'ruby' 'perl')
-source=("marisa-trie::https://github.com/s-yata/marisa-trie/archive/v$pkgver.tar.gz")
+makedepends=('python' 'ruby' 'perl' 'swig')
+source=("marisa-trie-$pkgver.tar.gz::https://github.com/s-yata/marisa-trie/archive/v$pkgver.tar.gz")
 sha512sums=('62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547')
 
 prepare() {
@@ -34,6 +34,9 @@ build() {
 
   make
 
+  # Regenerate swig bindings
+  make -C bindings -j1
+
   # Perl bindings
   cd "$srcdir"/marisa-trie-$pkgver/bindings/perl
   perl Makefile.PL \
@@ -43,10 +46,10 @@ build() {
 
   # Python bindings
   cd "$srcdir"/marisa-trie-$pkgver/bindings/python
-  python2 setup.py build_ext \
+  python setup.py build_ext \
     --include-dirs="$srcdir"/marisa-trie-$pkgver/include \
     --library-dirs="$srcdir"/marisa-trie-$pkgver/lib/marisa/.libs
-  python2 setup.py build
+  python setup.py build
 
   # Ruby bindings
   cd "$srcdir"/marisa-trie-$pkgver/bindings/ruby
@@ -83,12 +86,12 @@ package_perl-marisa() {
   install -m 644 AUTHORS COPYING.md "$pkgdir"/usr/share/licenses/$pkgname/
 }
 
-package_python2-marisa() {
-  pkgdesc="Python 2.x language binding for marisa"
-  depends=('python2' 'marisa')
+package_python-marisa() {
+  pkgdesc="Python language binding for marisa"
+  depends=('python' 'marisa')
 
   cd marisa-trie-$pkgver/bindings/python
-  python2 setup.py install -O1 --root="$pkgdir"
+  python setup.py install -O1 --root="$pkgdir"
 
   cd ../..
   install -d "$pkgdir"/usr/share/licenses/$pkgname