diff --git a/vlc.changes b/vlc.changes
index d7a891d..6b4ee0b 100644
--- a/vlc.changes
+++ b/vlc.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue May  7 13:22:21 UTC 2013 - dimstar@opensuse.org
+
+- Move live555-devel BuildRequires to the unconditional area:
+  live555 has been added to Factory and is safe for distribution.
+- Move the live555 demuxer from vlc-codecs to vlc-noX.
+- Add unconditional --enable-live555 parameter to configure, and
+  remove the conditional enable/remove-live555, based on BUILD_ORIG.
+
 -------------------------------------------------------------------
 Thu May  2 18:19:13 UTC 2013 - dimstar@opensuse.org
 
diff --git a/vlc.spec b/vlc.spec
index fc2aacc..255aeac 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -101,6 +101,7 @@ BuildRequires:  libva-devel
 BuildRequires:  libvorbis-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  lirc-devel
+BuildRequires:  live555-devel
 %if 0%{?suse_version} >= 1220
 BuildRequires:  lua51-devel
 %else
@@ -144,7 +145,6 @@ BuildRequires:  libmpeg2-devel
 BuildRequires:  libtwolame-devel
 BuildRequires:  libx264-devel
 BuildRequires:  libxvidcore-devel
-BuildRequires:  live555-devel
 %endif
 
 Requires:       %{name}-noX = %{version}-%{release}
@@ -284,9 +284,9 @@ export CXXFLAGS="%{optflags} -L%{_libdir}/live -msse"
 %endif
    --enable-lirc                        \
    --enable-swscale                     \
+   --enable-live555                     \
 %if 0%{?BUILD_ORIG}
    --enable-libmpeg2                    \
-   --enable-live555                     \
    --enable-mad                         \
    --enable-avcodec                     \
    --enable-postproc                    \
@@ -295,7 +295,6 @@ export CXXFLAGS="%{optflags} -L%{_libdir}/live -msse"
    --enable-dca                         \
 %else
    --disable-libmpeg2                   \
-   --disable-live555                    \
    --disable-mad                        \
    --disable-avcodec                    \
    --disable-postproc                   \