diff --git a/debian/changelog b/debian/changelog
index b37d7912f..3e5c1b0c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,7 +19,6 @@ freeipa (3.3.4-1) UNRELEASED; urgency=low
   * control: Add python-libipa-hbac to build-depends.
   * control: Add ${shlibs:Depends} to python-freeipa depends.
   * rules: Strip the executable bit from translation files.
-  * fix-format-string.diff: Fix build errors, thanks Krzysztof Klimonda!
   * Use dh_python2.
   * Add DEP-3 compliant headers to the patches.
   * control: client; Move libpam-krb5 to Suggests.
diff --git a/debian/patches/correct-python-path.diff b/debian/patches/correct-python-path.diff
index d54f4b1f8..c28a53476 100644
--- a/debian/patches/correct-python-path.diff
+++ b/debian/patches/correct-python-path.diff
@@ -7,5 +7,5 @@
 -PYTHON ?= $(shell rpm -E %__python)
 +PYTHON ?= $(shell rpm -E %__python || echo /usr/bin/python)
  
- all: bootstrap-autogen server tests
- 	@for subdir in $(SUBDIRS); do \
+ # Uncomment to increase Java stack size for Web UI build in case it fails
+ # because of stack overflow exception. Default should be OK for most platforms.
diff --git a/debian/patches/fix-string-format.diff b/debian/patches/fix-string-format.diff
deleted file mode 100644
index 4d1ccd434..000000000
--- a/debian/patches/fix-string-format.diff
+++ /dev/null
@@ -1,77 +0,0 @@
-From 93f421284081d88bbe224b48c65fbcd3deaa7b36 Mon Sep 17 00:00:00 2001
-From: Krzysztof Klimonda <kklimonda@syntaxhighlighted.com>
-Date: Sun, 12 Feb 2012 18:21:38 +0100
-Subject: [PATCH] Fix -Wformat-security warnings
-
----
- .../ipa-enrollment/ipa_enrollment.c                |    6 +++---
- .../ipa-pwd-extop/ipa_pwd_extop.c                  |    8 ++++----
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
---- a/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c
-+++ b/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c
-@@ -317,7 +317,7 @@ free_and_return:
- 
-     if (krbLastPwdChange) slapi_ch_free_string(&krbLastPwdChange);
- 
--    LOG(errMesg ? errMesg : "success\n");
-+    LOG("%s", errMesg ? errMesg : "success\n");
-     slapi_send_ldap_result(pb, rc, NULL, errMesg, 0, NULL);
- 
-     free(principal);
-@@ -344,7 +344,7 @@ ipaenrollment_extop(Slapi_PBlock *pb)
-     if (slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &oid ) != 0) {
-         errMesg = "Could not get OID and value from request.\n";
-         rc = LDAP_OPERATIONS_ERROR;
--        LOG(errMesg);
-+        LOG("%s", errMesg);
-         goto free_and_return;
-     }
- 
-@@ -357,7 +357,7 @@ ipaenrollment_extop(Slapi_PBlock *pb)
-     rc = LDAP_OPERATIONS_ERROR;
- 
- free_and_return:
--    LOG(errMesg);
-+    LOG("%s", errMesg);
-     slapi_send_ldap_result(pb, rc, NULL, errMesg, 0, NULL);
- 
-     return SLAPI_PLUGIN_EXTENDED_SENT_RESULT;
---- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
-+++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
-@@ -549,7 +549,7 @@ free_and_return:
- 	if (targetEntry) slapi_entry_free(targetEntry);
- 	if (ber) ber_free(ber, 1);
- 
--	LOG(errMesg ? errMesg : "success");
-+	LOG("%s", errMesg ? errMesg : "success");
- 	slapi_send_ldap_result(pb, rc, NULL, errMesg, 0, NULL);
- 
- 	return SLAPI_PLUGIN_EXTENDED_SENT_RESULT;
-@@ -1119,7 +1119,7 @@ free_and_return:
- 
-         if (rc == LDAP_SUCCESS)
-             errMesg = NULL;
--	LOG(errMesg ? errMesg : "success");
-+	LOG("%s", errMesg ? errMesg : "success");
- 	slapi_send_ldap_result(pb, rc, NULL, errMesg, 0, NULL);
- 
- 	return SLAPI_PLUGIN_EXTENDED_SENT_RESULT;
-@@ -1146,7 +1146,7 @@ static int ipapwd_extop(Slapi_PBlock *pb
- 	if (slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &oid) != 0) {
- 		errMesg = "Could not get OID value from request.\n";
- 		rc = LDAP_OPERATIONS_ERROR;
--		LOG(errMesg);
-+		LOG("%s", errMesg);
- 		goto free_and_return;
- 	} else {
- 	        LOG("Received extended operation request with OID %s\n", oid);
-@@ -1169,7 +1169,7 @@ static int ipapwd_extop(Slapi_PBlock *pb
- free_and_return:
- 	if (krbcfg) free_ipapwd_krbcfg(&krbcfg);
- 
--	LOG(errMesg);
-+	LOG("%s", errMesg);
- 	slapi_send_ldap_result(pb, rc, NULL, errMesg, 0, NULL);
- 
- 	return SLAPI_PLUGIN_EXTENDED_SENT_RESULT;
diff --git a/debian/patches/series b/debian/patches/series
index 27e95ff41..db1798903 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,7 +10,6 @@ dont-check-for-systemd-pc.diff
 fix-portability-of-nss.diff
 
 # send upstream
-fix-string-format.diff
 correct-python-path.diff
 dont-search-platform-path.diff
 fix-symlink-exclusion.diff