diff --git a/ChangeLog b/ChangeLog
index a513672..f8d8658 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-07 Riccardo Mottola <rmottola@users.sf.net>
+
+	* Headers/ProjectCenter/PCPrefController.h,
+	Framework/PCPrefController.m: handle setting path from Buttons 
+
+
 2008-11-27 22:06-EST Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Modules/Projects/Application/Resources/AppController.m: Correct 
diff --git a/Framework/PCPrefController.m b/Framework/PCPrefController.m
index 6c06a81..0f2910f 100644
--- a/Framework/PCPrefController.m
+++ b/Framework/PCPrefController.m
@@ -1,7 +1,7 @@
 /*
    GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html
 
-   Copyright (C) 2001 Free Software Foundation
+   Copyright (C) 2001-2008 Free Software Foundation
 
    This file is part of GNUstep.
 
@@ -664,7 +664,18 @@ static PCPrefController *_prefCtrllr = nil;
 
 - (void)setBuildTool:(id)sender
 {
-  NSString *path = [buildToolField stringValue];
+  NSString *path;
+ 
+  if (sender == buildToolButton)
+    {
+      path = [self selectFileWithTypes:nil];
+      [buildToolField setStringValue:path];
+    }
+  else
+    {
+      path = [buildToolField stringValue];
+    } 
+
  
   if ([path isEqualToString:@""] || !path)
     {
@@ -685,7 +696,18 @@ static PCPrefController *_prefCtrllr = nil;
 
 - (void)setDebugger:(id)sender
 {
-  NSString *path = [debuggerField stringValue];
+  NSString *path;
+  
+  if (sender == buildToolButton)
+    {
+      path = [self selectFileWithTypes:nil];
+      [debuggerField setStringValue:path];
+    }
+  else
+    {
+      path = [debuggerField stringValue];
+    }   
+;
  
   if ([path isEqualToString:@""] || !path)
     {
diff --git a/Headers/ProjectCenter/PCPrefController.h b/Headers/ProjectCenter/PCPrefController.h
index 5aa8505..f645714 100644
--- a/Headers/ProjectCenter/PCPrefController.h
+++ b/Headers/ProjectCenter/PCPrefController.h
@@ -1,7 +1,7 @@
 /*
    GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html
 
-   Copyright (C) 2001 Free Software Foundation
+   Copyright (C) 2001-2008 Free Software Foundation
 
    This file is part of GNUstep.
 
@@ -66,7 +66,9 @@
   IBOutlet NSButton      *deleteCache;
   IBOutlet NSButton      *fullPathInFilePanels;
   IBOutlet NSTextField   *buildToolField;
+  IBOutlet NSButton      *buildToolButton;
   IBOutlet NSTextField   *debuggerField;
+  IBOutlet NSButton      *debuggerButton;
   IBOutlet NSTextField   *editorField;
 
   IBOutlet NSBox         *interfaceView;