diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a40c4c9b121d7cd6985714c076c17b10a139f7a2..fee5892168105640224ace578da316cebd470fcd 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,5 @@
 Zen 5.x-1.x-dev
+  #199036 by joachim: Make padding on #squeeze conditional
   #199578: Fatal error on Zen Classic theme settings when using admin theme
   #196230: Tabs broken in IE5 and IE6
   #199682: 'Submitted by' text is shown even if setting is disabled
diff --git a/zen_classic/layout.css b/zen_classic/layout.css
index cbe7b708e1308e85dcd4c064075a7bdace134f5a..ed26340772eeac526fffea2c7f79458f14227be8 100644
--- a/zen_classic/layout.css
+++ b/zen_classic/layout.css
@@ -42,17 +42,18 @@ body.two-sidebars #main {
 
 #squeeze {
   position: relative;
-  padding: 0 1em;
 }
 
 /* And add blanks left and right for the sidebars to fill */
 body.sidebar-left #squeeze,
 body.two-sidebars #squeeze {
   margin-left: 210px;
+  padding-left: 1em;
 }
 body.sidebar-right #squeeze,
 body.two-sidebars #squeeze {
   margin-right: 210px;
+  padding-right: 1em;
 }
 
 /* We ensure the sidebars are still clickable using z-index */