diff --git a/debian/changelog b/debian/changelog
index 09307da..01d230a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+bsh (2.0b4-21) UNRELEASED; urgency=medium
+
+ * Remove constraints unnecessary since buster:
+ + Build-Depends: Drop versioned constraint on javahelper.
+ + libbsh-java: Drop versioned constraint on bsh in Replaces.
+ + libbsh-java: Drop versioned constraint on bsh in Breaks.
+ * Remove constraints unnecessary since buster (oldstable):
+ + Build-Depends: Replace dependency on transitional package
+ libservlet3.1-java with replacement libservlet-api-java, libjsp-api-java,
+ libel-api-java, libwebsocket-api-java.
+
+ -- Debian Janitor <janitor@jelmer.uk> Thu, 01 Sep 2022 12:27:58 -0000
+
bsh (2.0b4-20) unstable; urgency=medium
* Normalize the permissions of the files in bsh.tar.gz to make
diff --git a/debian/control b/debian/control
index b348bec..4e0e1c9 100644
--- a/debian/control
+++ b/debian/control
@@ -9,9 +9,9 @@ Build-Depends:
default-jdk,
default-jdk-doc,
javacc,
- javahelper (>= 0.32~),
+ javahelper,
libbsf-java,
- libservlet3.1-java,
+ libservlet-api-java, libjsp-api-java, libel-api-java, libwebsocket-api-java,
libservlet3.1-java-doc,
maven-repo-helper
Standards-Version: 4.4.0
@@ -45,8 +45,6 @@ Package: libbsh-java
Architecture: all
Section: java
Depends: ${misc:Depends}
-Replaces: bsh (<= 2.0b4-13~)
-Breaks: bsh (<= 2.0b4-13~)
Description: Java scripting environment (BeanShell) Version 2 (library)
BeanShell is a small, free, embeddable, Java source interpreter with object
scripting language features, written in Java. BeanShell executes standard Java