diff --git a/database-schema.sql b/database-schema.sql
index 608751f60f..6bfb8ae527 100644
--- a/database-schema.sql
+++ b/database-schema.sql
@@ -216,7 +216,7 @@ CREATE TABLE IF NOT EXISTS `devices` (
   `sysName` varchar(128) CHARACTER SET latin1 DEFAULT NULL,
   `community` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `snmpver` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'v2c',
-  `port` smallint(5) NOT NULL DEFAULT '161',
+  `port` smallint(5) unsigned NOT NULL DEFAULT '161',
   `transport` varchar(16) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'udp',
   `timeout` int(11) DEFAULT NULL,
   `retries` int(11) DEFAULT NULL,
diff --git a/database-update.sql b/database-update.sql
index e5b2b6c273..b3b2a0e98b 100644
--- a/database-update.sql
+++ b/database-update.sql
@@ -3,4 +3,4 @@ ALTER TABLE  `storage` ADD UNIQUE  `index_unique` (  `device_id` ,  `storage_mib
 ALTER TABLE  `bgpPeers_cbgp` ADD  `AcceptedPrefixes` INT NOT NULL ,ADD  `DeniedPrefixes` INT NOT NULL ,ADD  `PrefixAdminLimit` INT NOT NULL ,ADD  `PrefixThreshold` INT NOT NULL ,ADD  `PrefixClearThreshold` INT NOT NULL ,ADD  `AdvertisedPrefixes` INT NOT NULL ,ADD  `SuppressedPrefixes` INT NOT NULL ,ADD  `WithdrawnPrefixes` INT NOT NULL;
 ALTER TABLE  `bgpPeers_cbgp` ADD UNIQUE  `unique_index` (  `device_id` ,  `bgpPeerIdentifier` ,  `afi` ,  `safi` );
 ALTER TABLE  `ports` ADD UNIQUE  `device_ifIndex` (  `device_id` ,  `ifIndex` );
-
+ALTER TABLE  `devices` CHANGE  `port`  `port` SMALLINT( 5 ) UNSIGNED NOT NULL DEFAULT  '161';