diff --git a/.gitignore b/.gitignore
index 457276f..d446de3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ _build
 /condor-8.1.1-12f3fa1-RH.tar.gz
 /htcondor-8.1.4-a1a7df5.tar.gz
 /htcondor-8.3.1.tar.gz
+/htcondor-8.3.5.tar.gz
diff --git a/00personal_condor.config b/00personal_condor.config
new file mode 100644
index 0000000..57604b9
--- /dev/null
+++ b/00personal_condor.config
@@ -0,0 +1,34 @@
+##  What machine is your central manager?
+
+CONDOR_HOST = $(FULL_HOSTNAME)
+
+## Pool's short description
+
+COLLECTOR_NAME = Personal Condor at $(FULL_HOSTNAME)
+
+##  When is this machine willing to start a job? 
+
+START = TRUE
+
+
+##  When to suspend a job?
+
+SUSPEND = FALSE
+
+
+##  When to nicely stop a job?
+##  (as opposed to killing it instantaneously)
+
+PREEMPT = FALSE
+
+
+##  When to instantaneously kill a preempting job
+##  (e.g. if a job is in the pre-empting stage for too long)
+
+KILL = FALSE
+
+##  This macro determines what daemons the condor_master will start and keep its watchful eyes on.
+##  The list is a comma or space separated list of subsystem names
+
+DAEMON_LIST = COLLECTOR, MASTER, NEGOTIATOR, SCHEDD, STARTD
+
diff --git a/condor.spec b/condor.spec
index 9dee47d..8eef1ed 100644
--- a/condor.spec
+++ b/condor.spec
@@ -1,5 +1,5 @@
 %global newname         htcondor
-%global srcver		8_3_1
+%global srcver		8_3_5
 #global commit          a1a7df5888506c46cf7ce54ef8171336b7c71e72
 #global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
@@ -10,10 +10,13 @@
 # disable plumage (and need for mongodb)
 %global with_mongodb   0
 
+# disable aviary
+%global with_aviary    0
+
 #######################
 Name:           condor
-Version:        8.3.1
-Release:        4%{?dist}
+Version:        8.3.5
+Release:        1%{?dist}
 #Release:        1.%{shortcommit}%{?dist}
 Summary:        Condor: High Throughput Computing
 License:        ASL 2.0
@@ -27,6 +30,7 @@ Source0:        https://github.com/htcondor/htcondor/archive/V%{srcver}/%{newnam
 #Source0:        https://github.com/htcondor/htcondor/archive/%{commit}/%{newname}-%{version}-%{shortcommit}.tar.gz
 Source1:        %{name}-tmpfiles.conf
 Source2:        %{name}.service
+Source3:	00personal_condor.config
 
 Patch1:         condor-gahp.patch
 # turn off the cmake regex-replace hack that removes "-Werror", as it 
@@ -81,8 +85,10 @@ BuildRequires: voms-devel
 # support for deltacloud... may go away
 BuildRequires: libdeltacloud-devel
 # support for aviary
+%if 0%{?with_aviary}
 BuildRequires: wso2-wsf-cpp-devel
 BuildRequires: wso2-axis2-devel
+%endif
 # support for plumage
 %if 0%{?with_mongodb}
 BuildRequires: mongodb-devel
@@ -128,6 +134,7 @@ A daemon for tracking child processes started by a parent.
 Part of HTCondor, but able to be stand-alone
 
 #######################
+%if 0%{?with_aviary}
 %package aviary-common
 Summary: HTCondor Aviary development components
 Group: Applications/System
@@ -167,6 +174,7 @@ Requires: condor-aviary-hadoop-common = %{version}-%{release}
 
 %description aviary-hadoop
 Aviary Hadoop plugin and components.
+%endif
 
 #######################
 %if 0%{?with_mongodb}
@@ -313,6 +321,7 @@ exit 0
 %patch2 -p1
 cp %{SOURCE1} %{name}-tmpfiles.conf
 cp %{SOURCE2} %{name}.service
+cp %{SOURCE3} .
 
 %build
 %cmake -DNO_PHONE_HOME:BOOL=TRUE \
@@ -338,7 +347,9 @@ cp %{SOURCE2} %{name}.service
 %if 0%{?with_mongodb}
        -DWITH_PLUMAGE:BOOL=TRUE \
 %endif
+%if 0%{?with_aviary}
        -DWITH_AVIARY:BOOL=TRUE \
+%endif
        -DWANT_FULL_DEPLOYMENT:BOOL=TRUE \
        -DBLAHP_FOUND=/usr/libexec/BLClient \
        -DWITH_BLAHP:BOOL=TRUE \
@@ -404,8 +415,9 @@ sed -e "s:^LIB\s*=.*:LIB = \$(RELEASE_DIR)/$LIB/condor:" \
 # Install the basic configuration, a Personal HTCondor config. Allows for
 # yum install condor + service condor start and go.
 mkdir -m0755 %{buildroot}/%{_sysconfdir}/condor/config.d
-cp %{buildroot}/etc/examples/condor_config.local %{buildroot}/%{_sysconfdir}/condor/config.d/00personal_condor.config
+cp 00personal_condor.config %{buildroot}/%{_sysconfdir}/condor/config.d/00personal_condor.config
 
+%if 0%{?with_aviary}
 populate %_sysconfdir/condor/config.d %{buildroot}/etc/examples/61aviary.config
 populate %_sysconfdir/condor/config.d %{buildroot}/etc/examples/63aviary-hadoop.config
 
@@ -415,6 +427,8 @@ populate %{_var}/lib/condor/aviary %{buildroot}/usr/services/
 
 populate %{_libdir}/condor/plugins %{buildroot}/%{_usr}/libexec/condor/*-plugin.so
 populate %{_libdir}/ %{buildroot}/%{_datadir}/condor/libaviary_*
+%endif
+
 
 %if 0%{?with_mongodb}
 # Install condor-plumage's base plugin configuration
@@ -513,6 +527,9 @@ rm %{buildroot}%{_libexecdir}/condor/condor_schedd.init
 # I'm going to hold off on ganglia stuff for another rev or two
 rm -rf %{buildroot}/etc/condor/ganglia.d
 rm -rf %{buildroot}%{_libexecdir}/condor/condor_gangliad
+rm -rf %{buildroot}%{_libexecdir}/condor/pandad
+rm -rf %{buildroot}%{_libexecdir}/condor/panda-plugin.so
+rm -rf %{buildroot}%{_libexecdir}/condor/libclassad_python_user.so
 
 # Install BOSCO
 #mkdir -p %{buildroot}%{python_sitelib}
@@ -639,6 +656,8 @@ echo "*********** Verify NMI status is all GREEN ***********"
 %_mandir/man1/condor_pool_job_report.1.gz
 %_mandir/man1/condor_sos.1.gz
 %_mandir/man1/condor_urlfetch.1.gz
+%_mandir/man1/condor_job_router_info.1.gz
+%_mandir/man1/condor_update_machine_ad.1.gz
 # bin/condor is a link for checkpoint, reschedule, vacate
 %_libdir/libcondor_utils*.so
 %_bindir/condor_submit_dag
@@ -683,6 +702,8 @@ echo "*********** Verify NMI status is all GREEN ***********"
 %_bindir/condor_qsub
 %_bindir/condor_tail
 %_bindir/condor_pool_job_report
+%_bindir/condor_job_router_info
+%_bindir/condor_update_machine_ad
 %_sbindir/condor_advertise
 %_sbindir/condor_c-gahp
 %_sbindir/condor_c-gahp_worker_thread
@@ -739,6 +760,7 @@ echo "*********** Verify NMI status is all GREEN ***********"
 %_mandir/man1/condor_procd.1.gz
 
 #################
+%if 0%{?with_aviary}
 %files aviary-common
 %doc LICENSE-2.0.txt NOTICE.txt
 %dir %_datadir/condor/aviary
@@ -820,6 +842,7 @@ echo "*********** Verify NMI status is all GREEN ***********"
 %_datadir/condor/aviary/hdfs_namenode.sh
 %_datadir/condor/aviary/mapred_jobtracker.sh
 %_datadir/condor/aviary/mapred_tasktracker.sh
+%endif
 
 #################
 %if 0%{?with_mongodb}
@@ -957,6 +980,11 @@ echo "*********** Verify NMI status is all GREEN ***********"
 /sbin/ldconfig
 
 %changelog
+* Wed Jun 17 2015 Matthew Farrellee <matt@redhat> - 8.3.5-1
+- Update to latest source 8.3.5
+- Disable aviary
+- Moved 00personal_condor.config to SOURCES, removed upstream
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.3.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index fbf3d43..8725a44 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8152554660465d9526b35f50c86beffc  htcondor-8.3.1.tar.gz
+b0a1dbf402adcc05e3c2ca5972f77321  htcondor-8.3.5.tar.gz