diff --git a/pipewire.changes b/pipewire.changes
index 0462d45..7fce251 100644
--- a/pipewire.changes
+++ b/pipewire.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Aug 27 08:33:01 UTC 2021 - Antonio Larrosa <alarrosa@suse.com>
+
+- Add BuildRequires: pkgconfig(libcap) since it's being searched
+  by the build scripts.
+- Replace BuildRequires: pkgconfig(libopenaptx) with libfreeaptx
+  since openaptx has a license issue
+- Use bcond_with to enable/disable the usage of libcamera
+  (the defaults are not changed: it's disabled in Leap since
+  upstream doesn't recommend enabling it yet and enabled in TW
+  since we can allow some experimental support there)
+- Changes suggested by darix.
+
 -------------------------------------------------------------------
 Thu Aug 26 12:27:15 UTC 2021 - Antonio Larrosa <alarrosa@suse.com>
 
diff --git a/pipewire.spec b/pipewire.spec
index 2e4117f..c536d36 100644
--- a/pipewire.spec
+++ b/pipewire.spec
@@ -29,12 +29,6 @@
 %define with_vulkan 0
 %endif
 
-%if 0%{?suse_version} >= 1550
-%define with_libcamera 1
-%else
-%define with_libcamera 0
-%endif
-
 %ifnarch s390 s390x ppc64
 %define with_ldacBT 1
 %else
@@ -43,6 +37,11 @@
 
 %bcond_with aac
 %bcond_with aptx
+%if 0%{?suse_version} >= 1550
+%bcond_without libcamera
+%else
+%bcond_with libcamera
+%endif
 
 Name:           pipewire
 Version:        0.3.34
@@ -69,10 +68,11 @@ BuildRequires:  xmltoman
 BuildRequires:  pkgconfig(alsa) >= 1.1.7
 BuildRequires:  pkgconfig(avahi-client)
 BuildRequires:  pkgconfig(bluez)
-%if %{with_libcamera}
-BuildRequires:  pkgconfig(libcamera)
+%if %{with libcamera}
+BuildRequires:  pkgconfig(libcamera) >= 0~2752
 %endif
 BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(libcap)
 %if %{with aac}
 BuildRequires:  pkgconfig(fdk-aac)
 %endif
@@ -96,7 +96,7 @@ BuildRequires:  pkgconfig(libavcodec)
 BuildRequires:  pkgconfig(libavfilter)
 BuildRequires:  pkgconfig(libavformat)
 %if %{with aptx}
-BuildRequires:  pkgconfig(libopenaptx)
+BuildRequires:  pkgconfig(libfreeaptx)
 %endif
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libsystemd)
@@ -347,7 +347,7 @@ export CC=gcc-9
 %else
     -Dbluez5-codec-ldac=disabled \
 %endif
-%if %{with_libcamera}
+%if %{with libcamera}
     -Dlibcamera=enabled \
 %else
     -Dlibcamera=disabled \
@@ -648,7 +648,7 @@ fi
 %{_libdir}/spa-%{spa_ver}/control/libspa-control.so
 %{_libdir}/spa-%{spa_ver}/ffmpeg/libspa-ffmpeg.so
 %{_libdir}/spa-%{spa_ver}/jack/libspa-jack.so
-%if %{with_libcamera}
+%if %{with libcamera}
 %{_libdir}/spa-%{spa_ver}/libcamera/libspa-libcamera.so
 %endif
 %{_libdir}/spa-%{spa_ver}/support/libspa-dbus.so
@@ -673,7 +673,7 @@ fi
 %dir %{_libdir}/spa-%{spa_ver}/volume
 %dir %{_libdir}/spa-%{spa_ver}/ffmpeg
 %dir %{_libdir}/spa-%{spa_ver}/jack
-%if %{with_libcamera}
+%if %{with libcamera}
 %dir %{_libdir}/spa-%{spa_ver}/libcamera
 %endif
 %dir %{_libdir}/spa-%{spa_ver}/support