diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0662b1990a5..3f7965f9865 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -39593,29 +39593,37 @@ federated microblogging social network.")
     (license license:gpl3+)))
 
 (define-public emacs-org-social
-  (let ((commit "e52c727c08444a3c6ccceb75492504e59ad5e804")
-        (revision "0"))
-    (package
-      (name "emacs-org-social")
-      (version (git-version "1.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/tanrax/org-social.el")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "06izvlmqx2yhig84i4xfcc6wdv5jyj1jr3irc6xdwbvwpck2qbcg"))))
-      (build-system emacs-build-system)
-      (arguments (list #:tests? #f))
-      (propagated-inputs (list emacs-request))
-      (home-page "https://github.com/tanrax/org-social.el")
-      (synopsis "Emacs client for Org-social")
-      (description
-       "This package provides an Emacs client for Org-social which is
+  (package
+    (name "emacs-org-social")
+    (version "2.7.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tanrax/org-social.el")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "06d8z4jvrxwi3r0wh5wdrlrsxksplwyg1iiiwbfgajx9d84y0md6"))))
+    (build-system emacs-build-system)
+    (arguments
+     (list
+      #:tests? #f ;no tests
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'move-to-top
+            (lambda _
+              (for-each (lambda (f)
+                          (rename-file f
+                                       (basename f)))
+                        (find-files "./ui" ".*\\.el$")))))))
+    (propagated-inputs (list emacs-emojify emacs-request))
+    (home-page "https://github.com/tanrax/org-social.el")
+    (synopsis "Emacs client for Org-social")
+    (description
+     "This package provides an Emacs client for Org-social which is
 a decentralized social network that runs on an Org Mode file over HTTP.")
-      (license license:gpl3+))))
+    (license license:gpl3+)))
 
 (define-public emacs-fedi
   ;; One year since last tagged release.