diff --git a/MOVED b/MOVED
index 39505f74fdfb..9f6d09b599ae 100644
--- a/MOVED
+++ b/MOVED
@@ -10497,3 +10497,4 @@ x11-themes/qt4-style-Kvantum|x11-themes/Kvantum@qt4|2018-08-26|Moved to flavored
 x11-themes/qt5-style-Kvantum|x11-themes/Kvantum@qt5|2018-08-26|Moved to flavored version
 devel/gps||2018-08-28|Has expired: Depends on obsolete LLVM 3.8.
 net-mgmt/ocsinventory-ng|net-mgmt/ocsinventory-server|2018-08-26|split port
+www/py-buku|www/buku|2018-09-01|Moved to correct directory, port is not a python library
diff --git a/www/Makefile b/www/Makefile
index 88b413d7b264..3ae31430fdc7 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -55,6 +55,7 @@
     SUBDIR += bolt
     SUBDIR += bookmarkbridge
     SUBDIR += bozohttpd
+    SUBDIR += buku
     SUBDIR += butterfly
     SUBDIR += c-icap
     SUBDIR += c-icap-modules
@@ -1524,7 +1525,6 @@
     SUBDIR += py-bottle
     SUBDIR += py-bottle-cork
     SUBDIR += py-branca
-    SUBDIR += py-buku
     SUBDIR += py-cachecontrol
     SUBDIR += py-caldav
     SUBDIR += py-cheroot
diff --git a/www/py-buku/Makefile b/www/buku/Makefile
similarity index 93%
rename from www/py-buku/Makefile
rename to www/buku/Makefile
index cf13bfd3ae65..2f459d4c06fa 100644
--- a/www/py-buku/Makefile
+++ b/www/buku/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	buku
-PORTVERSION=	3.8
+PORTVERSION=	3.9
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www python
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Powerful command-line bookmark manager
diff --git a/www/buku/distinfo b/www/buku/distinfo
new file mode 100644
index 000000000000..e6baa9d07ee8
--- /dev/null
+++ b/www/buku/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1535752203
+SHA256 (jarun-Buku-v3.9_GH0.tar.gz) = eb756901634f08dc294e511c69021e3c8bc24b34d16209e46e5cd3f6007d42be
+SIZE (jarun-Buku-v3.9_GH0.tar.gz) = 205011
diff --git a/www/py-buku/pkg-descr b/www/buku/pkg-descr
similarity index 100%
rename from www/py-buku/pkg-descr
rename to www/buku/pkg-descr
diff --git a/www/py-buku/distinfo b/www/py-buku/distinfo
deleted file mode 100644
index be8905b0644e..000000000000
--- a/www/py-buku/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1527162554
-SHA256 (jarun-Buku-v3.8_GH0.tar.gz) = bca35fe1b7dbf88ed3af07e0daa4bc0a736d2f85b3103efcb18d542eebb2eebe
-SIZE (jarun-Buku-v3.8_GH0.tar.gz) = 147434