diff --git a/ChangeLog b/ChangeLog
index 6227b56ba3..6975b435cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jul 27 10:21:28 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/unix.rb: add UNIXFileOwner, UNIXFileGroup.
+
 Sun Jul 27 03:10:43 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* io.c (io_reopen): avoid dup2() equal handles not to close itself and
diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb
index eef4902cef..e92a7a88ca 100644
--- a/lib/drb/unix.rb
+++ b/lib/drb/unix.rb
@@ -31,6 +31,14 @@ module DRb
       else
 	soc = UNIXServer.open(filename)
       end
+      owner = config[:UNIXFileOwner]
+      group = config[:UNIXFileGroup]
+      if owner || group
+        require 'etc'
+        owner = Etc.getpwnam( owner ).uid  if owner
+        group = Etc.getgrnam( group ).gid  if group
+        File.chown owner, group, filename
+      end
       mode = config[:UNIXFileMode]
       File.chmod(mode, filename) if mode