diff --git a/pipewire.changes b/pipewire.changes
index 82122ef..fa006df 100644
--- a/pipewire.changes
+++ b/pipewire.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Thu Dec  9 10:34:27 UTC 2021 - Antonio Larrosa <alarrosa@suse.com>
+
+- Unconditionally enable AAC support now that fdk-aac-free is in
+  Factory (adapted from SR 936225 by Neal Gompa
+  <ngompa@opensuse.org>)
+
+-------------------------------------------------------------------
+Fri Dec  3 09:06:42 UTC 2021 - Antonio Larrosa <alarrosa@suse.com>
+
+- Makes sure if we're using wireplumber and pulseaudio that
+  we don't enable the audio devices in pipewire by requiring
+  wireplumber-audio or pulseaudio if wireplumber is installed
+
+- Better integration with PulseAudio (bsc#1188516) made by tiwai:
+  * Add Requires pulseaudio-setup package for the extra setups
+    in the %post section
+  * Add the missing Recommends alsa-plugins-pulse to
+    pipewire-pulseaudio package
+
 -------------------------------------------------------------------
 Fri Nov 12 12:47:56 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/pipewire.spec b/pipewire.spec
index 2599dab..ebe58ad 100644
--- a/pipewire.spec
+++ b/pipewire.spec
@@ -35,12 +35,13 @@
 %define with_ldacBT 0
 %endif
 
-%bcond_with aac
 %bcond_with aptx
 %if 0%{?suse_version} >= 1550
 %bcond_without libcamera
+%bcond_without aac
 %else
 %bcond_with libcamera
+%bcond_with aac
 %endif
 
 Name:           pipewire
@@ -119,6 +120,8 @@ Requires:       %{name}-spa-plugins-%{spa_ver_str} = %{version}
 Requires:       %{name}-spa-tools = %{version}
 Requires:       %{name}-tools = %{version}
 Recommends:     wireplumber
+# This tries to ensure the user either uses pulseaudio or wireplumber enables the audio in pipewire
+Requires:       ((wireplumber-audio or pulseaudio) if wireplumber)
 %{?systemd_ordering}
 
 %description
@@ -290,6 +293,10 @@ Group:          Development/Libraries/C and C++
 Recommends:     %{name} >= %{version}-%{release}
 Requires:       %{libpipewire} >= %{version}-%{release}
 Conflicts:      pulseaudio
+%if 0%{suse_version} >= 1550
+Requires(post): pulseaudio-setup
+%endif
+Recommends:     alsa-plugins-pulse
 
 # Virtual Provides to support swapping between PipeWire-PA and PA
 Provides:       pulseaudio-daemon
@@ -451,6 +458,10 @@ if [ ! -L %{_sysconfdir}/systemd/user/sockets.target.wants/pipewire-pulse.socket
 # https://bugzilla.opensuse.org/show_bug.cgi?id=1186561
 EOF
 fi
+%if 0%{suse_version} >= 1550
+# Update the /etc/profile.d/pulseaudio.* files
+setup-pulseaudio --auto > /dev/null
+%endif
 
 %preun pulseaudio
 %systemd_user_preun pipewire-pulse.service pipewire-pulse.socket