diff --git a/src/Linux.Bluetooth/Device.cs b/src/Linux.Bluetooth/Device.cs
index cfd93b1..334b470 100644
--- a/src/Linux.Bluetooth/Device.cs
+++ b/src/Linux.Bluetooth/Device.cs
@@ -16,6 +16,7 @@ public class Device : IDevice1, IDisposable
   {
     private const string DeviceConnected = "Connected";
     private const string DeviceServicesResolved = "ServicesResolved";
+    private const string DeviceRSSI = "RSSI";
 
     private IDevice1 _proxy;
     private IDisposable _propertyWatcher;
@@ -64,6 +65,16 @@ public event DeviceEventHandlerAsync Connected
 
     public event DeviceEventHandlerAsync Disconnected;
 
+    /// <summary>Raised when the device's RSSI property changes, carrying the new value in dBm.</summary>
+    public event EventHandler<short>? RSSIChanged;
+
+    /// <summary>
+    /// Raised for every Device1 property change, carrying the raw <see cref="PropertyChanges"/>. Covers
+    /// properties without a dedicated typed event (e.g. ManufacturerData, TxPower). Note that changes also
+    /// covered by a typed event (Connected, ServicesResolved, RSSI) are delivered on both.
+    /// </summary>
+    public event EventHandler<PropertyChanges>? PropertyChanged;
+
     public event DeviceEventHandlerAsync ServicesResolved
     {
       add
@@ -244,8 +255,16 @@ private void OnPropertyChanges(PropertyChanges changes)
               OnResolved?.Invoke(this, new BlueZEventArgs());
 
             break;
+
+          case DeviceRSSI:
+            if (pair.Value is short sRSSI)
+              RSSIChanged?.Invoke(this, sRSSI);
+
+            break;
         }
       }
+
+      PropertyChanged?.Invoke(this, changes);
     }
   }
 }
diff --git a/src/Linux.Bluetooth/Extensions/WatchableExtensions.cs b/src/Linux.Bluetooth/Extensions/WatchableExtensions.cs
index 8dd2a81..5887802 100644
--- a/src/Linux.Bluetooth/Extensions/WatchableExtensions.cs
+++ b/src/Linux.Bluetooth/Extensions/WatchableExtensions.cs
@@ -17,7 +17,7 @@ public static class WatchableExtensions
     /// <returns>Task or exception.</returns>
     /// <exception cref="TimeoutException">On timeout a <seealso cref="TimeoutException"/> is thrown.</exception>
     public static Task WaitForPropertyValueAsync<T>(this IAdapter1 obj, string propertyName, T value, TimeSpan timeout)
-      => WaitForPropertyValueInternalAsync(obj.GetAsync<T>, obj.WatchPropertiesAsync, propertyName, value, timeout);
+      => WaitForPropertyValueAsync(obj.GetAsync<T>, obj.WatchPropertiesAsync, propertyName, value, timeout);
 
     /// <summary>Wait for AdvertisingManager's Property and specified value to resolve.</summary>
     /// <typeparam name="T">Type of value.</typeparam>
@@ -28,7 +28,7 @@ public static Task WaitForPropertyValueAsync<T>(this IAdapter1 obj, string prope
     /// <returns>Task or exception.</returns>
     /// <exception cref="TimeoutException">On timeout a <seealso cref="TimeoutException"/> is thrown.</exception>
     public static Task WaitForPropertyValueAsync<T>(this ILEAdvertisingManager1 obj, string propertyName, T value, TimeSpan timeout)
-      => WaitForPropertyValueInternalAsync(obj.GetAsync<T>, obj.WatchPropertiesAsync, propertyName, value, timeout);
+      => WaitForPropertyValueAsync(obj.GetAsync<T>, obj.WatchPropertiesAsync, propertyName, value, timeout);
 
     /// <summary>Wait for Device's Property and specified value to resolve.</summary>
     /// <typeparam name="T">Type of value.</typeparam>
@@ -39,7 +39,7 @@ public static Task WaitForPropertyValueAsync<T>(this ILEAdvertisingManager1 obj,
     /// <returns>Task or exception.</returns>
     /// <exception cref="TimeoutException">On timeout a <seealso cref="TimeoutException"/> is thrown.</exception>
     public static Task WaitForPropertyValueAsync<T>(this IDevice1 obj, string propertyName, T value, TimeSpan timeout)
-      => WaitForPropertyValueInternalAsync(obj.GetAsync<T>, obj.WatchPropertiesAsync, propertyName, value, timeout);
+      => WaitForPropertyValueAsync(obj.GetAsync<T>, obj.WatchPropertiesAsync, propertyName, value, timeout);
 
     /// <summary>Wait for Battery's Property and specified value to resolve.</summary>
     /// <typeparam name="T">Type of value.</typeparam>
@@ -50,7 +50,7 @@ public static Task WaitForPropertyValueAsync<T>(this IDevice1 obj, string proper
     /// <returns>Task or exception.</returns>
     /// <exception cref="TimeoutException">On timeout a <seealso cref="TimeoutException"/> is thrown.</exception>
     public static Task WaitForPropertyValueAsync<T>(this IBattery1 obj, string propertyName, T value, TimeSpan timeout)
-      => WaitForPropertyValueInternalAsync(obj.GetAsync<T>, obj.WatchPropertiesAsync, propertyName, value, timeout);
+      => WaitForPropertyValueAsync(obj.GetAsync<T>, obj.WatchPropertiesAsync, propertyName, value, timeout);
 
     /*
     /// <summary>Wait for GattService's Property and specified value to resolve.</summary>
@@ -62,7 +62,7 @@ public static Task WaitForPropertyValueAsync<T>(this IBattery1 obj, string prope
     /// <returns>Task or exception.</returns>
     /// <exception cref="TimeoutException">On timeout a <seealso cref="TimeoutException"/> is thrown.</exception>
     public static Task WaitForPropertyValueAsync<T>(this IGattService1 obj, string propertyName, T value, TimeSpan timeout)
-      => WaitForPropertyValueInternalAsync(obj.GetAsync<T>, obj.WatchPropertiesAsync, propertyName, value, timeout);
+      => WaitForPropertyValueAsync(obj.GetAsync<T>, obj.WatchPropertiesAsync, propertyName, value, timeout);
 
     /// <summary>Wait for GattCharacteristic's Property and specified value to resolve.</summary>
     /// <typeparam name="T">Type of value.</typeparam>
@@ -73,7 +73,7 @@ public static Task WaitForPropertyValueAsync<T>(this IGattService1 obj, string p
     /// <returns>Task or exception.</returns>
     /// <exception cref="TimeoutException">On timeout a <seealso cref="TimeoutException"/> is thrown.</exception>
     public static Task WaitForPropertyValueAsync<T>(this IGattCharacteristic1 obj, string propertyName, T value, TimeSpan timeout)
-      => WaitForPropertyValueInternalAsync(obj.GetAsync<T>, obj.WatchPropertiesAsync, propertyName, value, timeout);
+      => WaitForPropertyValueAsync(obj.GetAsync<T>, obj.WatchPropertiesAsync, propertyName, value, timeout);
 
     /// <summary>Wait for GattDescriptor's Property and specified value to resolve.</summary>
     /// <typeparam name="T">Type of value.</typeparam>
@@ -84,7 +84,7 @@ public static Task WaitForPropertyValueAsync<T>(this IGattCharacteristic1 obj, s
     /// <returns>Task or exception.</returns>
     /// <exception cref="TimeoutException">On timeout a <seealso cref="TimeoutException"/> is thrown.</exception>
     public static Task WaitForPropertyValueAsync<T>(this IGattDescriptor1 obj, string propertyName, T value, TimeSpan timeout)
-      => WaitForPropertyValueInternalAsync(obj.GetAsync<T>, obj.WatchPropertiesAsync, propertyName, value, timeout);
+      => WaitForPropertyValueAsync(obj.GetAsync<T>, obj.WatchPropertiesAsync, propertyName, value, timeout);
     */
 
     /// <summary>Wait for MediaControl's Property and specified value to resolve.</summary>
@@ -96,7 +96,7 @@ public static Task WaitForPropertyValueAsync<T>(this IGattDescriptor1 obj, strin
     /// <returns>Task or exception.</returns>
     /// <exception cref="TimeoutException">On timeout a <seealso cref="TimeoutException"/> is thrown.</exception>
     public static Task WaitForPropertyValueAsync<T>(this IMediaControl1 obj, string propertyName, T value, TimeSpan timeout)
-      => WaitForPropertyValueInternalAsync(obj.GetAsync<T>, obj.WatchPropertiesAsync, propertyName, value, timeout);
+      => WaitForPropertyValueAsync(obj.GetAsync<T>, obj.WatchPropertiesAsync, propertyName, value, timeout);
 
     /// <summary>
     /// Wait for watchable objects property and specified value to resolve.
@@ -110,10 +110,13 @@ public static Task WaitForPropertyValueAsync<T>(this IMediaControl1 obj, string
     /// <param name="timeout">TimeSpan to wait for.</param>
     /// <returns>Task or exception.</returns>
     /// <exception cref="TimeoutException">On timeout a <seealso cref="TimeoutException"/> is thrown.</exception>
-    private static async Task WaitForPropertyValueInternalAsync<T>(
+    public static async Task WaitForPropertyValueAsync<T>(
       Func<string, Task<T>> getAsync,
-      Func<Action<PropertyChanges>, Task<IDisposable>> watchPropertiesAsync,
-      string propertyName, T value, TimeSpan timeout)
+      Func<Action<PropertyChanges>,
+      Task<IDisposable>> watchPropertiesAsync,
+      string propertyName,
+      T value,
+      TimeSpan timeout)
     {
       // TODO: Change to Task<bool> versus throwing an error.
       var (watchTask, watcher) = WaitForPropertyValueInternal(watchPropertiesAsync, propertyName, value);