diff --git a/luna/include/luna/OwnedPtr.h b/luna/include/luna/OwnedPtr.h
index cc147f24..0f76630d 100644
--- a/luna/include/luna/OwnedPtr.h
+++ b/luna/include/luna/OwnedPtr.h
@@ -2,6 +2,8 @@
 #include <luna/Alloc.h>
 #include <luna/Result.h>
 
+template <typename T> class SharedPtr;
+
 template <typename T> class OwnedPtr
 {
   public:
@@ -38,6 +40,8 @@ template <typename T> class OwnedPtr
         return *m_ptr;
     }
 
+    template <typename Type> friend Result<SharedPtr<Type>> adopt_shared_from_owned(OwnedPtr<Type>&&);
+
   private:
     T* m_ptr;
 };
diff --git a/luna/include/luna/SharedPtr.h b/luna/include/luna/SharedPtr.h
index 4cf1bcff..6a9caffd 100644
--- a/luna/include/luna/SharedPtr.h
+++ b/luna/include/luna/SharedPtr.h
@@ -1,6 +1,7 @@
 #pragma once
 #include <luna/Alloc.h>
 #include <luna/Atomic.h>
+#include <luna/OwnedPtr.h>
 #include <luna/Result.h>
 #include <luna/ScopeGuard.h>
 
@@ -118,4 +119,18 @@ template <typename T> Result<SharedPtr<T>> adopt_shared_if_nonnull(T* ptr)
     if (ptr) return adopt_shared(ptr);
     else
         return err(ENOMEM);
+}
+
+template <typename T> Result<SharedPtr<T>> adopt_shared_from_owned(OwnedPtr<T>&& other)
+{
+    T* ptr = other.m_ptr;
+    other.m_ptr = nullptr;
+
+    auto guard = make_scope_guard([&] { delete ptr; });
+
+    SharedPtr<T> shared_ptr = TRY(adopt_shared(ptr));
+
+    guard.deactivate();
+
+    return shared_ptr;
 }
\ No newline at end of file