diff --git a/libraries/libmesosphere/include/mesosphere/kern_k_thread.hpp b/libraries/libmesosphere/include/mesosphere/kern_k_thread.hpp
index cb0731037..462d25ddb 100644
--- a/libraries/libmesosphere/include/mesosphere/kern_k_thread.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_thread.hpp
@@ -314,7 +314,10 @@ namespace ams::kern {
             KThread *RemoveWaiterByKey(s32 *out_num_waiters, KProcessAddress key);
 
             constexpr KProcessAddress GetAddressKey() const { return this->arbiter_key; }
+            constexpr u32 GetAddressKeyValue() const { return this->arbiter_value; }
             constexpr void SetAddressKey(KProcessAddress key) { this->arbiter_key = key; }
+            constexpr void SetAddressKey(KProcessAddress key, u32 val) { this->arbiter_key = key; this->arbiter_value = val; }
+
             constexpr void SetLockOwner(KThread *owner) { this->lock_owner = owner; }
             constexpr KThread *GetLockOwner() const { return this->lock_owner; }
 
diff --git a/libraries/libmesosphere/source/kern_k_condition_variable.cpp b/libraries/libmesosphere/source/kern_k_condition_variable.cpp
index 34ad03687..526d504e2 100644
--- a/libraries/libmesosphere/source/kern_k_condition_variable.cpp
+++ b/libraries/libmesosphere/source/kern_k_condition_variable.cpp
@@ -21,14 +21,99 @@ namespace ams::kern {
 
         constinit KThread g_cv_compare_thread;
 
+        ALWAYS_INLINE bool ReadFromUser(u32 *out, KProcessAddress address) {
+            return UserspaceAccess::CopyMemoryFromUserSize32Bit(out, GetVoidPointer(address));
+        }
+
+        ALWAYS_INLINE bool WriteToUser(KProcessAddress address, const u32 *p) {
+            return UserspaceAccess::CopyMemoryToUserSize32Bit(GetVoidPointer(address), p);
+        }
+
     }
 
     Result KConditionVariable::SignalToAddress(KProcessAddress addr) {
-        MESOSPHERE_UNIMPLEMENTED();
+        KThread *owner_thread = std::addressof(GetCurrentThread());
+
+        /* Signal the address. */
+        {
+            KScopedSchedulerLock sl;
+
+            /* Remove waiter thread. */
+            s32 num_waiters;
+            KThread *next_owner_thread = owner_thread->RemoveWaiterByKey(std::addressof(num_waiters), addr);
+
+            /* Determine the next tag. */
+            u32 next_value = 0;
+            if (next_owner_thread) {
+                next_value = next_owner_thread->GetAddressKeyValue();
+                if (num_waiters > 1) {
+                    next_value |= ams::svc::HandleWaitMask;
+                }
+
+                next_owner_thread->SetSyncedObject(nullptr, ResultSuccess());
+                next_owner_thread->Wakeup();
+            }
+
+            /* Write the value to userspace. */
+            if (!WriteToUser(addr, std::addressof(next_value))) {
+                if (next_owner_thread) {
+                    next_owner_thread->SetSyncedObject(nullptr, svc::ResultInvalidCurrentMemory());
+                }
+
+                return svc::ResultInvalidCurrentMemory();
+            }
+        }
+
+        return ResultSuccess();
     }
 
     Result KConditionVariable::WaitForAddress(ams::svc::Handle handle, KProcessAddress addr, u32 value) {
-        MESOSPHERE_UNIMPLEMENTED();
+        KThread *cur_thread = std::addressof(GetCurrentThread());
+
+        /* Wait for the address. */
+        {
+            KScopedAutoObject<KThread> owner_thread;
+            MESOSPHERE_ASSERT(owner_thread.IsNull());
+            {
+                KScopedSchedulerLock sl;
+                cur_thread->SetSyncedObject(nullptr, ResultSuccess());
+
+                /* Check if the thread should terminate. */
+                R_UNLESS(!cur_thread->IsTerminationRequested(), svc::ResultTerminationRequested());
+
+                {
+                    /* Read the tag from userspace. */
+                    u32 test_tag;
+                    R_UNLESS(ReadFromUser(std::addressof(test_tag), addr), svc::ResultInvalidCurrentMemory());
+
+                    /* If the tag isn't the handle (with wait mask), we're done. */
+                    R_SUCCEED_IF(test_tag != (handle | ams::svc::HandleWaitMask));
+
+                    /* Get the lock owner thread. */
+                    owner_thread = GetCurrentProcess().GetHandleTable().GetObject<KThread>(handle);
+                    R_UNLESS(owner_thread.IsNotNull(), svc::ResultInvalidHandle());
+
+                    /* Update the lock. */
+                    cur_thread->SetAddressKey(addr, value);
+                    owner_thread->AddWaiter(cur_thread);
+                    cur_thread->SetState(KThread::ThreadState_Waiting);
+                }
+            }
+            MESOSPHERE_ASSERT(owner_thread.IsNotNull());
+        }
+
+        /* Remove the thread as a waiter from the lock owner. */
+        {
+            KScopedSchedulerLock sl;
+            KThread *owner_thread = cur_thread->GetLockOwner();
+            if (owner_thread != nullptr) {
+                owner_thread->RemoveWaiter(cur_thread);
+            }
+        }
+
+        /* Get the wait result. */
+        KSynchronizationObject *dummy;
+        return cur_thread->GetWaitResult(std::addressof(dummy));
     }
 
     KThread *KConditionVariable::SignalImpl(KThread *thread) {
diff --git a/libraries/libmesosphere/source/svc/kern_svc_lock.cpp b/libraries/libmesosphere/source/svc/kern_svc_lock.cpp
index 1c264dcc4..a0e02deb1 100644
--- a/libraries/libmesosphere/source/svc/kern_svc_lock.cpp
+++ b/libraries/libmesosphere/source/svc/kern_svc_lock.cpp
@@ -21,28 +21,48 @@ namespace ams::kern::svc {
 
     namespace {
 
+        constexpr bool IsKernelAddress(uintptr_t address) {
+            return KernelVirtualAddressSpaceBase <= address && address < KernelVirtualAddressSpaceEnd;
+        }
 
+        Result ArbitrateLock(ams::svc::Handle thread_handle, uintptr_t address, uint32_t tag) {
+            /* Validate the input address. */
+            R_UNLESS(!IsKernelAddress(address),             svc::ResultInvalidCurrentMemory());
+            R_UNLESS(util::IsAligned(address, sizeof(u32)), svc::ResultInvalidAddress());
+
+            MESOSPHERE_LOG("%lx: ArbitrateLock(%08x, %lx, %08x)\n", GetCurrentThread().GetId(), thread_handle, address, tag);
+            return GetCurrentProcess().WaitForAddress(thread_handle, address, tag);
+        }
+
+        Result ArbitrateUnlock(uintptr_t address) {
+            /* Validate the input address. */
+            R_UNLESS(!IsKernelAddress(address),             svc::ResultInvalidCurrentMemory());
+            R_UNLESS(util::IsAligned(address, sizeof(u32)), svc::ResultInvalidAddress());
+
+            MESOSPHERE_LOG("%lx: ArbitrateUnlock(%lx)\n", GetCurrentThread().GetId(), address);
+            return GetCurrentProcess().SignalToAddress(address);
+        }
 
     }
 
     /* =============================    64 ABI    ============================= */
 
     Result ArbitrateLock64(ams::svc::Handle thread_handle, ams::svc::Address address, uint32_t tag) {
-        MESOSPHERE_PANIC("Stubbed SvcArbitrateLock64 was called.");
+        return ArbitrateLock(thread_handle, address, tag);
     }
 
     Result ArbitrateUnlock64(ams::svc::Address address) {
-        MESOSPHERE_PANIC("Stubbed SvcArbitrateUnlock64 was called.");
+        return ArbitrateUnlock(address);
     }
 
     /* ============================= 64From32 ABI ============================= */
 
     Result ArbitrateLock64From32(ams::svc::Handle thread_handle, ams::svc::Address address, uint32_t tag) {
-        MESOSPHERE_PANIC("Stubbed SvcArbitrateLock64From32 was called.");
+        return ArbitrateLock(thread_handle, address, tag);
     }
 
     Result ArbitrateUnlock64From32(ams::svc::Address address) {
-        MESOSPHERE_PANIC("Stubbed SvcArbitrateUnlock64From32 was called.");
+        return ArbitrateUnlock(address);
     }
 
 }