diff --git a/PKGBUILD b/PKGBUILD
index a820bc2..4c3089d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,18 +11,18 @@ license=(MIT)
 depends=(libxft)
 provides=(st)
 conflicts=(st)
-source=("$_pkgname-$pkgver.tar.gz"
+source=("$_pkgname.tar.gz"
         "$_pkgname.desktop")
 sha256sums=(SKIP
             SKIP)
 
 build() {
-    cd "$srcdir/$_pkgname-$pkgver"
+    cd "$srcdir/$_pkgname"
     make
 }
 
 package() {
-    cd "$srcdir/$_pkgname-$pkgver"
+    cd "$srcdir/$_pkgname"
     make PREFIX=/usr DESTDIR="$pkgdir" install
     install -m644 -D LICENSE "$pkgdir/usr/share/doc/$_pkgname/LICENSE"
     install -m644 -D README "$pkgdir/usr/share/doc/$_pkgname/README"
diff --git a/make.sh b/make.sh
index 7f62fa4..6fdd1f5 100755
--- a/make.sh
+++ b/make.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
 pkgname=st
-pkgver=0.8.4
-tar -zcvf "${pkgname}-${pkgver}.tar.gz" "${pkgname}-${pkgver}"
+tar -zcvf "$pkgname.tar.gz" "$pkgname"
 makepkg -cfsi
diff --git a/st-0.8.4/FAQ b/st/FAQ
similarity index 100%
rename from st-0.8.4/FAQ
rename to st/FAQ
diff --git a/st-0.8.4/LEGACY b/st/LEGACY
similarity index 100%
rename from st-0.8.4/LEGACY
rename to st/LEGACY
diff --git a/st-0.8.4/LICENSE b/st/LICENSE
similarity index 100%
rename from st-0.8.4/LICENSE
rename to st/LICENSE
diff --git a/st-0.8.4/Makefile b/st/Makefile
similarity index 100%
rename from st-0.8.4/Makefile
rename to st/Makefile
diff --git a/st-0.8.4/README b/st/README
similarity index 100%
rename from st-0.8.4/README
rename to st/README
diff --git a/st-0.8.4/TODO b/st/TODO
similarity index 100%
rename from st-0.8.4/TODO
rename to st/TODO
diff --git a/st-0.8.4/arg.h b/st/arg.h
similarity index 100%
rename from st-0.8.4/arg.h
rename to st/arg.h
diff --git a/st-0.8.4/config.def.h b/st/config.def.h
similarity index 100%
rename from st-0.8.4/config.def.h
rename to st/config.def.h
diff --git a/st-0.8.4/config.h b/st/config.h
similarity index 100%
rename from st-0.8.4/config.h
rename to st/config.h
diff --git a/st-0.8.4/config.mk b/st/config.mk
similarity index 100%
rename from st-0.8.4/config.mk
rename to st/config.mk
diff --git a/st-0.8.4/st.1 b/st/st.1
similarity index 100%
rename from st-0.8.4/st.1
rename to st/st.1
diff --git a/st-0.8.4/st.c b/st/st.c
similarity index 100%
rename from st-0.8.4/st.c
rename to st/st.c
diff --git a/st-0.8.4/st.h b/st/st.h
similarity index 100%
rename from st-0.8.4/st.h
rename to st/st.h
diff --git a/st-0.8.4/st.info b/st/st.info
similarity index 100%
rename from st-0.8.4/st.info
rename to st/st.info
diff --git a/st-0.8.4/win.h b/st/win.h
similarity index 100%
rename from st-0.8.4/win.h
rename to st/win.h
diff --git a/st-0.8.4/x.c b/st/x.c
similarity index 100%
rename from st-0.8.4/x.c
rename to st/x.c