diff --git a/lib/class.ISPConfig.inc.php b/lib/class.ISPConfig.inc.php
index 948130dcb7aa4a8a73ea9d06ad9790f7f23246b1..4800fe9ca6020f86f5ea622834f4107f83c0fbb2 100644
--- a/lib/class.ISPConfig.inc.php
+++ b/lib/class.ISPConfig.inc.php
@@ -173,6 +173,14 @@ class ISPConfig {
 		}
 	}
 
+	public static function wantsCertbot() {
+		if(isset($_GET['use-certbot']) && $_GET['use-certbot']) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
 	public static function wantsPHP() {
 		// If a new version is added, the getApacheModulesToDisable function should be updated to disable the latest version (this part could be improved)
 		$available_php_versions = array(
@@ -188,13 +196,13 @@ class ISPConfig {
 			if ($_GET['use-php'] === 'system') {
 				return $_GET['use-php'];
 			} else {
-				$use_php = explode(',',$_GET['use-php']);				
+				$use_php = explode(',',$_GET['use-php']);
 				$php_versions = array_intersect($use_php, $available_php_versions);
 				if(!empty($php_versions)) {
 					return $php_versions;
 				} else {
 					return false;
-				}				
+				}
 			}
 		} else {
 			return $available_php_versions;
@@ -246,9 +254,10 @@ Possible arguments are:
 	--use-unbound	->Use unbound instead of bind9 for local resolving. Only allowed if --no-dns is set.
 	--use-php		->Use specific PHP versions, comma separated, instead of installing multiple PHP, e.g. --use-php=7.4,8.0 (5.6, 7.0, 7.1, 7.2, 7.3, 7.4 and 8.0 available).
 					->--use-php=system disables the sury repository and just installs the system\'s default PHP version.
-					->ommiting the argument (use all versions) 
+					->ommiting the argument (use all versions)
 	--use-ftp-ports ->This option sets the passive port range for pure-ftpd. You have to specify the port range separated by hyphen, e. g. --use-ftp-ports=40110-40210.
 					->If not provided the passive port range will not be configured.
+	--use-certbot	->Use Certbot instead of acme.sh for issuing Let\'s Encrypt certificates. Not adviced unless you are migrating from a old server that uses Certbot.
 	--no-web		->Do not use ISPConfig on this server to manage webserver setting and don\'t install nginx/apache or pureftpd. This will also prevent installing an ISPConfig UI and implies --no-roundcube as well as --no-pma
 	--no-mail		->Do not use ISPConfig on this server to manage mailserver settings. This will install postfix for sending system mails, but not dovecot and not configure any settings for ISPConfig mail. It implies --no-mailman.
 	--no-dns		->Do not use ISPConfig on this server to manage DNS entries. Bind will be installed for local DNS caching / resolving only.
@@ -277,7 +286,7 @@ Possible arguments are:
 
 		$valid_args = array(
 			'help', 'debug', 'interactive',
-			'use-nginx', 'use-amavis', 'use-php', 'use-unbound', 'use-ftp-ports', 'channel', 'lang',
+			'use-nginx', 'use-amavis', 'use-php', 'use-unbound', 'use-ftp-ports', 'use-certbot', 'channel', 'lang',
 			'no-web', 'no-mail', 'no-dns', 'no-firewall', 'no-roundcube', 'no-pma', 'no-mailman', 'no-quota', 'no-ntp', 'no-local-dns',
 			'i-know-what-i-am-doing'
 		);
diff --git a/lib/os/class.ISPConfigDebianOS.inc.php b/lib/os/class.ISPConfigDebianOS.inc.php
index fe32aa94e323ce68ec85dfe9ffe47ea62eb0e83f..06c03d07b8933adab6ce11088ff6aacc0498039b 100644
--- a/lib/os/class.ISPConfigDebianOS.inc.php
+++ b/lib/os/class.ISPConfigDebianOS.inc.php
@@ -163,7 +163,7 @@ class ISPConfigDebianOS extends ISPConfigBaseOS {
 		$modules = array(
 			'mpm_prefork'
 		);
-		
+
 		return $modules;
 	}
 
@@ -930,13 +930,24 @@ mailman-unsubscribe:  "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
 			$this->restartService('apache2');
 		}
 
-		ISPConfigLog::info('Installing letsencrypt (acme.sh).', true);
-		$cmd = 'cd /tmp ; wget -O -  https://get.acme.sh 2>/dev/null | sh 2>/dev/null';
-		$result = $this->exec($cmd);
-		if($result === false) {
-			ISPConfigLog::warn('Installing letsencrypt failed.', true);
+		if (ISPConfig::wantsCertbot()) {
+			ISPConfigLog::info('Installing Certbot (Let\'s Encrypt).', true);
+			$cmd = 'cd /usr/local/bin ; wget https://dl.eff.org/certbot-auto ; chmod a+x certbot-auto ; ./certbot-auto --install-only';
+			$result = $this->exec($cmd);
+			if($result === false) {
+				ISPConfigLog::warn('Installation of Certbot (Let\'s Encrypt) failed.', true);
+			} else {
+				ISPConfigLog::info('Certbot installed.', true);
+			}
 		} else {
-			ISPConfigLog::info('Letsencrypt installed.', true);
+			ISPConfigLog::info('Installing acme.sh (Let\'s Encrypt).', true);
+			$cmd = 'cd /tmp ; wget -O -  https://get.acme.sh 2>/dev/null | sh 2>/dev/null';
+			$result = $this->exec($cmd);
+			if($result === false) {
+				ISPConfigLog::warn('Installation of acme.sh (Let\'s Encrypt) failed.', true);
+			} else {
+				ISPConfigLog::info('acme.sh (Let\'s Encrypt) installed.', true);
+			}
 		}
 
 		$mailman_password = '';