diff --git a/release.sh b/release.sh
index b34c7bf..62aedc3 100755
--- a/release.sh
+++ b/release.sh
@@ -17,7 +17,7 @@
 git add debian/changelog
 )
 
-rm -rf "$BUILDDIR" "$(dirname "$BUILDDIR")/rust-$PKG-$VER_$VER"*.orig.tar.*
+rm -rf "$BUILDDIR" "$(dirname "$BUILDDIR")/rust-${PKGNAME}_$VER"*.orig.tar.*
 $DEBCARGO package --config "$PKGCFG" --directory "$BUILDDIR" --changelog-ready "$PKG" "$VER"
 
 git diff --exit-code -- "$PKGDIR_REL" || \
diff --git a/src/bitflags-0.9/debian/changelog b/src/bitflags-0.9/debian/changelog
index 3d1d7fa..9da106a 100644
--- a/src/bitflags-0.9/debian/changelog
+++ b/src/bitflags-0.9/debian/changelog
@@ -1,6 +1,6 @@
 rust-bitflags-0.9 (0.9.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
 
-  * Package bitflags 0.9.1 from crates.io using debcargo 2.0.0
+  * Package bitflags 0.9.1 from crates.io using debcargo 2.1.0
     (Closes: #895356)
 
- -- Wolfgang Silbermayr <wolfgang@silbermayr.at>  Sat, 09 Jun 2018 10:26:10 +0200
+ -- Ximin Luo <infinity0@debian.org>  Wed, 20 Jun 2018 09:55:15 -0700
diff --git a/src/bitflags-0.9/debian/copyright.debcargo.hint b/src/bitflags-0.9/debian/copyright.debcargo.hint
index ed00720..4608349 100644
--- a/src/bitflags-0.9/debian/copyright.debcargo.hint
+++ b/src/bitflags-0.9/debian/copyright.debcargo.hint
@@ -27,7 +27,8 @@
  before uploading to the archive.
 
 Files: debian/*
-Copyright: 2018 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+Copyright: 2018 Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+           2018 FIXME (overlay) Your Name <Your Email>
 License: MIT or Apache-2.0
 
 License: Apache-2.0
diff --git a/src/bitflags-0.9/debian/debcargo.toml b/src/bitflags-0.9/debian/debcargo.toml
index 62cc3f7..544a9c6 100644
--- a/src/bitflags-0.9/debian/debcargo.toml
+++ b/src/bitflags-0.9/debian/debcargo.toml
@@ -1 +1,2 @@
 overlay = "."
+semver_suffix = true
diff --git a/src/getopts/debian/changelog b/src/getopts/debian/changelog
index a6c0af2..9951659 100644
--- a/src/getopts/debian/changelog
+++ b/src/getopts/debian/changelog
@@ -1,6 +1,6 @@
-rust-getopts-0.2 (0.2.17-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+rust-getopts (0.2.17-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
 
-  * Package getopts 0.2.17 from crates.io using debcargo 2.0.0
+  * Package getopts 0.2.17 from crates.io using debcargo 2.1.0
     (Closes: #895355)
 
- -- Wolfgang Silbermayr <wolfgang@silbermayr.at>  Sat,  9 Jun 2018 09:41:22 +0200
+ -- Ximin Luo <infinity0@debian.org>  Wed, 20 Jun 2018 09:47:47 -0700
diff --git a/src/getopts/debian/copyright.debcargo.hint b/src/getopts/debian/copyright.debcargo.hint
index 89a2c01..6467d80 100644
--- a/src/getopts/debian/copyright.debcargo.hint
+++ b/src/getopts/debian/copyright.debcargo.hint
@@ -27,7 +27,8 @@
  before uploading to the archive.
 
 Files: debian/*
-Copyright: 2018 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+Copyright: 2018 Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+           2018 FIXME (overlay) Your Name <Your Email>
 License: MIT or Apache-2.0
 
 License: Apache-2.0
diff --git a/src/lazy-static/debian/changelog b/src/lazy-static/debian/changelog
index 539fbf8..349797f 100644
--- a/src/lazy-static/debian/changelog
+++ b/src/lazy-static/debian/changelog
@@ -1,5 +1,5 @@
-rust-lazy-static-1 (1.0.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+rust-lazy-static (1.0.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
 
-  * Package lazy_static 1.0.1 from crates.io using debcargo 2.0.0
+  * Package lazy_static 1.0.1 from crates.io using debcargo 2.1.0
 
- -- Ximin Luo <infinity0@debian.org>  Fri, 08 Jun 2018 21:21:41 -0700
+ -- Ximin Luo <infinity0@debian.org>  Wed, 20 Jun 2018 09:48:03 -0700
diff --git a/src/lazy-static/debian/copyright.debcargo.hint b/src/lazy-static/debian/copyright.debcargo.hint
index 73d477b..d274e86 100644
--- a/src/lazy-static/debian/copyright.debcargo.hint
+++ b/src/lazy-static/debian/copyright.debcargo.hint
@@ -48,7 +48,8 @@
  before uploading to the archive.
 
 Files: debian/*
-Copyright: 2018 Ximin Luo <infinity0@debian.org>
+Copyright: 2018 Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+           2018 FIXME (overlay) Your Name <Your Email>
 License: MIT or Apache-2.0
 
 License: Apache-2.0
diff --git a/update.sh b/update.sh
index 8d6608b..71ba649 100755
--- a/update.sh
+++ b/update.sh
@@ -11,7 +11,7 @@
 	echo "FIXME fill me in using ./copyright.debcargo.hint as a guide" > "$PKGDIR/debian/copyright"
 fi
 
-rm -rf "$BUILDDIR" "$(dirname "$BUILDDIR")/rust-$PKG-$VER_$VER"*.orig.tar.*
+rm -rf "$BUILDDIR" "$(dirname "$BUILDDIR")/rust-${PKGNAME}_$VER"*.orig.tar.*
 $DEBCARGO package --config "$PKGCFG" --directory "$BUILDDIR" "$PKG" "$VER"
 
 if ! git diff --quiet -- "$PKGDIR_REL"; then