diff --git a/src/agents/smtp/smtp.h b/src/agents/smtp/smtp.h
index c6de17a..cf49f04 100644
--- a/src/agents/smtp/smtp.h
+++ b/src/agents/smtp/smtp.h
@@ -1,3 +1,25 @@
+/****************************************************************************
+ ** <Novell-copyright>
+ ** Copyright (c) 2001 Novell, Inc. All Rights Reserved.
+ **
+ ** This program is free software; you can redistribute it and/or
+ ** modify it under the terms of version 2 of the GNU General Public License
+ ** as published by the Free Software Foundation.
+ **
+ ** This program is distributed in the hope that it will be useful,
+ ** but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ ** GNU General Public License for more details.
+ **
+ ** You should have received a copy of the GNU General Public License
+ ** along with this program; if not, contact Novell, Inc.
+ **
+ ** To contact Novell about this file by physical or electronic mail, you
+ ** may find current contact information at www.novell.com.
+ ** </Novell-copyright>
+ *****************************************************************************/
+// Parts Copyright (C) 2007-2008 Patrick Felt. See COPYING for details.
+
 #ifndef SMTP_H
 #define SMTP_H
 
diff --git a/src/agents/smtp/smtpc.c b/src/agents/smtp/smtpc.c
index f7ae50a..c0f63fe 100755
--- a/src/agents/smtp/smtpc.c
+++ b/src/agents/smtp/smtpc.c
@@ -18,6 +18,8 @@
  * may find current contact information at www.novell.com.
  * </Novell-copyright>
  ****************************************************************************/
+// Parts Copyright (C) 2007-2008 Alex Hudson. See COPYING for details.
+// Parts Copyright (C) 2007-2008 Patrick Felt. See COPYING for details.
 
 #include <config.h>
 
@@ -182,13 +184,13 @@ DeliverMessage(SMTPClient *Queue, SMTPClient *Remote, RecipStruct *Recip) {
 
 beginConversation:
     Extensions = 0;
-    ConnWriteF(Remote->conn, "EHLO %s\r\n", "FIXME");
+    ConnWriteF(Remote->conn, "EHLO %s\r\n", BongoGlobals.hostname);
     ConnFlush(Remote->conn);
     ConnReadAnswer(Remote->conn, Remote->line, CONN_BUFSIZE);
 
     if (Remote->line[0] != '2' ) {
         /* the remote server doesn't seem to support ehlo.  they should upgrade to bongo! */
-        ConnWriteF(Remote->conn, "HELO %s\r\n", "FIXME");
+        ConnWriteF(Remote->conn, "HELO %s\r\n", BongoGlobals.hostname);
         ConnFlush(Remote->conn);
         ConnReadAnswer(Remote->conn, Remote->line, CONN_BUFSIZE);
         if (atoi(Remote->line) != 250) {
diff --git a/src/agents/smtp/smtpc.h b/src/agents/smtp/smtpc.h
index 032d036..5093a83 100644
--- a/src/agents/smtp/smtpc.h
+++ b/src/agents/smtp/smtpc.h
@@ -18,6 +18,7 @@
  * may find current contact information at www.novell.com.
  * </Novell-copyright>
  ****************************************************************************/
+// Parts Copyright (C) 2007-2008 Patrick Felt. See COPYING for details.
 
 #ifndef _SMTPC_H
 #define _SMTPC_H
@@ -31,7 +32,7 @@
 
 #include "smtp.h"
 
-#define AGENT_NAME "smtpd_o"
+#define AGENT_NAME "smtpd_c"
 
 typedef struct {
     Connection *conn;
@@ -63,7 +64,7 @@ typedef struct _SMTPAgentGlobals {
 typedef struct {
     unsigned char To[MAXEMAILNAMESIZE+1];
     unsigned char ORecip[MAXEMAILNAMESIZE+1];
-    unsigned char SortField[MAXEMAILNAMESIZE+2]; /* will be formatted domain.com\0emailaddr -- used for comparisons and sorting */
+    unsigned char SortField[MAXEMAILNAMESIZE+2]; /* will be formatted domain.com@emailaddr -- used for comparisons and sorting */
     unsigned char *localPart; /* pointer into the SortField for the beginning of the localPart */
     size_t ToLen; /* just so we don't have to calculate the length a bunch of times */
     unsigned long Flags;