diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 937031105cf..fcd667f114b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-26  Luca Barbieri  <luca.barbieri@gmail.com>
+
+	PR libgcj/21136:
+	* gnu/java/nio/channels/FileChannelImpl.java (tryLock): Pass
+	'false' to native lock().
+	(lock): Pass 'true' to native lock().
+
 2005-04-26  Michael Koch  <konqueror@gmx.de>
 
 	* java/net/InetAddress.java:
diff --git a/libjava/gnu/java/nio/channels/FileChannelImpl.java b/libjava/gnu/java/nio/channels/FileChannelImpl.java
index e5b02e9fdb3..9d978c923f7 100644
--- a/libjava/gnu/java/nio/channels/FileChannelImpl.java
+++ b/libjava/gnu/java/nio/channels/FileChannelImpl.java
@@ -419,7 +419,7 @@ public final class FileChannelImpl extends FileChannel
     try
       {
 	begin();
-        lock(position, size, shared, true);
+        lock(position, size, shared, false);
 	completed = true;
 	return new FileLockImpl(this, position, size, shared);
       }
@@ -451,7 +451,7 @@ public final class FileChannelImpl extends FileChannel
 
     try
       {
-	boolean lockable = lock(position, size, shared, false);
+	boolean lockable = lock(position, size, shared, true);
 	completed = true;
 	return (lockable
 		? new FileLockImpl(this, position, size, shared)