diff --git a/src/cc65/pragma.c b/src/cc65/pragma.c
index ee71b42d8..b7384e2f1 100644
--- a/src/cc65/pragma.c
+++ b/src/cc65/pragma.c
@@ -433,12 +433,7 @@ static void ApplySegNamePragma (pragma_t Token, int PushPop, const char* Name, u
         SetSegAddrSize (Name, AddrSize);
     }
 
-    /* BSS variables are output at the end of the compilation.  Don't
-    ** bother to change their segment, now.
-    */
-    if (Seg != SEG_BSS) {
-        g_segname (Seg);
-    }
+    g_segname (Seg);
 }
 
 
diff --git a/test/val/bug2151.c b/test/val/bug2151.c
index 25f145506..1277961ef 100644
--- a/test/val/bug2151.c
+++ b/test/val/bug2151.c
@@ -47,10 +47,11 @@ _Pragma _Pragma (
 #pragma bss-name("BSS")
 {
     extern int y;
-#pragma bss-name("BSS2")
+#pragma bss-name("BSS") // used to be BSS2, but fix for #2608 means
+                        // that now causes ld65 to fail, so we use BSS instead
     static
 #pragma zpsym ("y")
-    int x; // TODO: currently in "BSS", but supposed to be in "BSS2"?
+    int x;
     x = 0;
 
     if (memcmp(str, "aBC", 3))