diff --git a/srcpkgs/ebtables/template b/srcpkgs/ebtables/template
index ce3725d321a..ee1cad0cedb 100644
--- a/srcpkgs/ebtables/template
+++ b/srcpkgs/ebtables/template
@@ -1,16 +1,17 @@
 # Template file for 'ebtables'
 pkgname=ebtables
-version=2.0.10_4
-revision=2
+version=2.0.10.4
+_version=${version%.*}-${version##*.}
+revision=1
 build_style=gnu-makefile
 short_desc="Filtering tool for a Linux-based bridging firewall"
 maintainer="Enno Boland <eb@s01.de>"
 license="GPL-2"
 homepage="http://ebtables.netfilter.org/"
 depends="perl"
-distfiles="http://ftp.netfilter.org/pub/ebtables/${pkgname}-v${version/_/-}.tar.gz"
+distfiles="http://ftp.netfilter.org/pub/ebtables/${pkgname}-v${_version}.tar.gz"
 checksum=dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d
-wrksrc=${pkgname}-v${version/_/-}
+wrksrc=${pkgname}-v${_version}
 make_build_args="CFLAGS+=-Wno-error=unused-but-set-variable"
 make_install_args="
  LIBDIR=/usr/lib \