diff --git a/.gitignore b/.gitignore
index e0c5f16..2278e2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,8 @@ opensm-3.3.2.tar.gz
 opensm-3.3.3.tar.gz
 opensm-3.3.5.tar.gz
 opensm-3.3.9.tar.gz
+opensm-3.3.9/
+/opensm-3.3.12.tar.gz
+/opensm-3.3.12.conf
+opensm-3.3.12/
+
diff --git a/opensm.conf b/opensm.conf
index 8abfe6d..27897d6 100644
--- a/opensm.conf
+++ b/opensm.conf
@@ -77,6 +77,24 @@ max_op_vls 5
 #    Default 15: set to PortInfo:LinkSpeedSupported
 force_link_speed 15
 
+# Force PortInfo:LinkSpeedExtEnabled on ports
+# If 0, don't modify PortInfo:LinkSpeedExtEnabled on port
+# Otherwise, use value for PortInfo:LinkSpeedExtEnabled on port
+# Values are (MgtWG RefID #4722)
+#    1: 14.0625 Gbps
+#    2: 25.78125 Gbps
+#    3: 14.0625 Gbps or 25.78125 Gbps
+#    30: Disable extended link speeds
+#    Default 31: set to PortInfo:LinkSpeedExtSupported
+force_link_speed_ext 31
+
+# FDR10 on ports on devices that support FDR10
+# Values are:
+#    0: don't use fdr10 (no MLNX ExtendedPortInfo MADs)
+#    Default 1: enable fdr10 when supported
+#    2: disable fdr10 when supported
+fdr10 1
+
 # The subnet_timeout code that will be set for all the ports
 # The actual timeout is 4.096usec * 2^<subnet_timeout>
 subnet_timeout 18
@@ -87,6 +105,9 @@ local_phy_errors_threshold 0x08
 # Threshold of credit overrun errors for sending Trap 130
 overrun_errors_threshold 0x08
 
+# Use SwitchInfo:MulticastFDBTop if advertised in PortInfo:CapabilityMask
+use_mfttop TRUE
+
 #
 # PARTITIONING OPTIONS
 #
@@ -124,14 +145,15 @@ port_prof_ignore_file (null)
 # The file holding routing weighting factors per output port
 hop_weights_file (null)
 
-# The file holding non-default port order per switch for DOR routing 
-dimn_ports_file (null)
+# The file holding non-default port order per switch for routing
+port_search_ordering_file (null)
 
 # Routing engine
 # Multiple routing engines can be specified separated by
 # commas so that specific ordering of routing algorithms will
 # be tried if earlier routing engines fail.
-# Supported engines: minhop, updn, file, ftree, lash, dor
+# Supported engines: minhop, updn, dnup, file, ftree, lash,
+#    dor, torus-2QoS
 routing_engine (null)
 
 # Connect roots (use FALSE if unsure)
@@ -175,6 +197,13 @@ do_mesh_analysis FALSE
 # Starting VL for LASH algorithm
 lash_start_vl 0
 
+# Port Shifting (use FALSE if unsure)
+port_shifting FALSE
+
+# Assign ports in a random order instead of round-robin.
+# If zero disable, otherwise use the value as a random seed
+scatter_ports 0
+
 # SA database file name
 sa_db_file (null)
 
@@ -182,6 +211,9 @@ sa_db_file (null)
 # every light sweep, regardless of the verbosity level
 sa_db_dump FALSE
 
+# Torus-2QoS configuration file name
+torus_config /etc/rdma/torus-2QoS.conf
+
 #
 # HANDOVER - MULTIPLE SMs OPTIONS
 #
@@ -224,7 +256,7 @@ transaction_retries 3
 # Maximal time in [msec] a message can stay in the incoming message queue.
 # If there is more than one message in the queue and the last message
 # stayed in the queue more than this value, any SA request will be
-# immediately returned with a BUSY status.
+# immediately be dropped but BUSY status is not currently returned.
 max_msg_fifo_timeout 10000
 
 # Use a single thread for handling SA queries
@@ -246,6 +278,27 @@ babbling_port_policy FALSE
 use_optimized_slvl FALSE
 
 #
+# Performance Manager Options
+#
+# perfmgr enable
+perfmgr FALSE
+
+# perfmgr redirection enable
+perfmgr_redir TRUE
+
+# sweep time in seconds
+perfmgr_sweep_time_s 180
+
+# Max outstanding queries
+perfmgr_max_outstanding_queries 500
+
+#
+# Event DB Options
+#
+# Dump file to dump the events to
+event_db_dump_file (null)
+
+#
 # Event Plugin Options
 #
 # Event plugin name(s)
diff --git a/opensm.spec b/opensm.spec
index 92635f4..196254a 100644
--- a/opensm.spec
+++ b/opensm.spec
@@ -1,5 +1,5 @@
 Name: opensm
-Version: 3.3.9
+Version: 3.3.12
 Release: 1%{?dist}
 Summary: OpenIB InfiniBand Subnet Manager and management utilities
 Group: System Environment/Daemons
@@ -11,7 +11,7 @@ Source2: opensm.logrotate
 Source3: opensm.initd
 Source4: opensm.sysconfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libibmad-devel = 1.3.7, libtool, bison, flex, byacc
+BuildRequires: libibmad-devel = 1.3.8, libtool, bison, flex, byacc
 Requires: %{name}-libs = %{version}-%{release}, logrotate, rdma
 ExcludeArch: s390 s390x
 
@@ -51,6 +51,8 @@ Static version of opensm libraries
 %build
 %configure --with-opensm-conf-sub-dir=rdma
 make %{?_smp_mflags}
+cd opensm
+./opensm -c ../../opensm-%{version}.conf
 
 %install
 rm -rf %{buildroot}
@@ -90,7 +92,7 @@ fi
 %dir /var/cache/opensm
 %{_sbindir}/*
 %{_initddir}/opensm
-%{_mandir}/man8/*
+%{_mandir}/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/opensm
 %config(noreplace) %{_sysconfdir}/rdma/opensm.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/opensm
@@ -110,6 +112,9 @@ fi
 %{_libdir}/lib*.a
 
 %changelog
+* Tue Jan 03 2012 Doug Ledford <dledford@redhat.com> - 3.3.12-1
+- Update to latest upstream version
+
 * Wed Jul 20 2011 Doug Ledford <dledford@redhat.com> - 3.3.9-1
 - Update to latest upstream version
 - Add /etc/sysconfig/opensm for use by opensm init script
diff --git a/sources b/sources
index e5916d5..e27513f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e9b461073f7cfbafe0207e014796f9f  opensm-3.3.9.tar.gz
+66beeccf6b16550609b37d588c0589ee  opensm-3.3.12.tar.gz