diff --git a/spec/std/socket/unix_socket_spec.cr b/spec/std/socket/unix_socket_spec.cr
index b3bc4931ec78..7e5eda4e2b65 100644
--- a/spec/std/socket/unix_socket_spec.cr
+++ b/spec/std/socket/unix_socket_spec.cr
@@ -63,6 +63,30 @@ describe UNIXSocket do
     end
   end
 
+  it "#send, #receive" do
+    with_tempfile("unix_socket-receive.sock") do |path|
+      UNIXServer.open(path) do |server|
+        UNIXSocket.open(path) do |client|
+          server.accept do |sock|
+            client.send "ping"
+            message, address = sock.receive
+            message.should eq("ping")
+            typeof(address).should eq(Socket::UNIXAddress)
+            address.path.should eq ""
+
+            sock.send "pong"
+            message, address = client.receive
+            message.should eq("pong")
+            typeof(address).should eq(Socket::UNIXAddress)
+            # The value of path seems to be system-specific. Some implementations
+            # return the socket path, others an empty path.
+            ["", path].should contain address.path
+          end
+        end
+      end
+    end
+  end
+
   # `LibC.socketpair` is not supported in Winsock 2.0 yet:
   # https://devblogs.microsoft.com/commandline/af_unix-comes-to-windows/#unsupportedunavailable
   {% unless flag?(:win32) %}
diff --git a/src/socket/unix_socket.cr b/src/socket/unix_socket.cr
index 201fd8410bf7..d5ce5857c907 100644
--- a/src/socket/unix_socket.cr
+++ b/src/socket/unix_socket.cr
@@ -97,8 +97,8 @@ class UNIXSocket < Socket
     UNIXAddress.new(path.to_s)
   end
 
-  def receive
-    bytes_read, sockaddr, addrlen = recvfrom
-    {bytes_read, UNIXAddress.from(sockaddr, addrlen)}
+  def receive(max_message_size = 512) : {String, UNIXAddress}
+    message, address = super(max_message_size)
+    {message, address.as(UNIXAddress)}
   end
 end