diff --git a/devices/audiocdsettings.cpp b/devices/audiocdsettings.cpp
index 6717f6ccd..5a596614e 100644
--- a/devices/audiocdsettings.cpp
+++ b/devices/audiocdsettings.cpp
@@ -48,7 +48,7 @@ AudioCdSettings::AudioCdSettings(QWidget *p)
     REMOVE(cddbPort)
     REMOVE(cddbPortLabel)
     #endif
-    #if !defined CDDB_FOUND
+    #if !defined LAME_FOUND
     REMOVE(playbackOptions)
     #endif
 }
@@ -61,7 +61,7 @@ void AudioCdSettings::load()
     cddbPort->setValue(Settings::self()->cddbPort());
     #endif
     #if defined LAME_FOUND
-    cdMp3->setChecked(Settings::self()->cdMp3());
+    cdEncode->setChecked(Settings::self()->cdEncode());
     #endif
     paranoiaFull->setChecked(Settings::self()->paranoiaFull());
     paranoiaNeverSkip->setChecked(Settings::self()->paranoiaNeverSkip());
@@ -88,7 +88,7 @@ void AudioCdSettings::save()
     Settings::self()->saveUseCddb(cdLookup->itemData(cdLookup->currentIndex()).toBool());
     #endif
     #if defined LAME_FOUND
-    Settings::self()->saveCdMp3(cdMp3->isChecked());
+    Settings::self()->saveCdEncode(cdEncode->isChecked());
     #endif
 }
 
diff --git a/devices/audiocdsettings.ui b/devices/audiocdsettings.ui
index 3ec7a09ad..5dc4fa5b6 100644
--- a/devices/audiocdsettings.ui
+++ b/devices/audiocdsettings.ui
@@ -132,12 +132,12 @@
          <string>Encode tracks to MP3:</string>
         </property>
         <property name="buddy">
-         <cstring>cdMp3</cstring>
+         <cstring>cdEncode</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="OnOffButton" name="cdMp3"/>
+       <widget class="OnOffButton" name="cdEncode"/>
       </item>
       <item row="2" column="0" colspan="2">
        <widget class="QLabel" name="label_2">
diff --git a/gui/settings.cpp b/gui/settings.cpp
index 453190e38..bd6225eec 100644
--- a/gui/settings.cpp
+++ b/gui/settings.cpp
@@ -588,9 +588,9 @@ bool Settings::cdAuto()
     return GET_BOOL("cdAuto", true);
 }
 #ifdef LAME_FOUND
-bool Settings::cdMp3()
+bool Settings::cdEncode()
 {
-    return GET_BOOL("cdMp3", true);
+    return GET_BOOL("cdEncode", true);
 }
 #endif
 #endif
@@ -965,9 +965,9 @@ void Settings::saveCdAuto(bool v)
     SET_VALUE_MOD(cdAuto)
 }
 #ifdef LAME_FOUND
-void Settings::saveCdMp3(bool v)
+void Settings::saveCdEncode(bool v)
 {
-    SET_VALUE_MOD(cdMp3)
+    SET_VALUE_MOD(cdEncode)
 }
 #endif
 #endif
diff --git a/gui/settings.h b/gui/settings.h
index bf2171532..0e69710bf 100644
--- a/gui/settings.h
+++ b/gui/settings.h
@@ -154,7 +154,7 @@ public:
     #if defined CDDB_FOUND || defined MUSICBRAINZ5_FOUND
     bool cdAuto();
     #ifdef LAME_FOUND
-    bool cdMp3();
+    bool cdEncode();
     #endif
     #endif
     #if defined CDDB_FOUND && defined MUSICBRAINZ5_FOUND
@@ -231,7 +231,7 @@ public:
     #if defined CDDB_FOUND || defined MUSICBRAINZ5_FOUND
     void saveCdAuto(bool v);
     #ifdef LAME_FOUND
-    void saveCdMp3(bool v);
+    void saveCdEncode(bool v);
     #endif
     #endif
     #if defined CDDB_FOUND && defined MUSICBRAINZ5_FOUND
diff --git a/http/httpsocket.cpp b/http/httpsocket.cpp
index 452d2ea07..9f8abfb8f 100644
--- a/http/httpsocket.cpp
+++ b/http/httpsocket.cpp
@@ -286,7 +286,7 @@ void HttpSocket::readClient()
                             static const int constMp3BufferSize=CD_FRAMESIZE_RAW*2*sizeof(short int);
                             static const int constPcmSize=CD_FRAMESIZE_RAW/(2*sizeof(short int));
                             unsigned char mp3Buffer[constMp3BufferSize];
-                            if (Settings::self()->cdMp3()) {
+                            if (Settings::self()->cdEncode()) {
                                 lame = lame_init();
                                 lame_set_num_channels(lame, 2);
                                 lame_set_in_samplerate(lame, 44100);